OpenJDK / jdk / jdk12
changeset 30397:8cd4c3d60f97
Merge
| author | duke |
|---|---|
| date | Wed, 05 Jul 2017 20:32:26 +0200 |
| parents | 8b01824b0cbb 07146758775b |
| children | c6b59b79f66b |
| files | hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SharedHeap.java hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualSpace.java hotspot/src/cpu/x86/vm/rtmLocking.cpp hotspot/src/cpu/x86/vm/templateTable_x86_32.hpp hotspot/src/cpu/x86/vm/templateTable_x86_64.hpp hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.inline.hpp hotspot/src/share/vm/memory/sharedHeap.cpp hotspot/src/share/vm/memory/sharedHeap.hpp hotspot/src/share/vm/oops/instanceClassLoaderKlass.cpp hotspot/src/share/vm/oops/klassPS.hpp hotspot/src/share/vm/oops/oop.pcgc.inline.hpp hotspot/src/share/vm/oops/oop.psgc.inline.hpp hotspot/src/share/vm/runtime/virtualspace.cpp hotspot/src/share/vm/runtime/virtualspace.hpp hotspot/test/sanity/WhiteBox.java jdk/src/java.management/share/classes/META-INF/services/sun.management.spi.PlatformMBeanProvider jdk/src/java.management/share/classes/com/sun/management/DiagnosticCommandMBean.java jdk/src/java.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java jdk/src/java.management/share/classes/com/sun/management/GarbageCollectorMXBean.java jdk/src/java.management/share/classes/com/sun/management/GcInfo.java jdk/src/java.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java jdk/src/java.management/share/classes/com/sun/management/OperatingSystemMXBean.java jdk/src/java.management/share/classes/com/sun/management/ThreadMXBean.java jdk/src/java.management/share/classes/com/sun/management/UnixOperatingSystemMXBean.java jdk/src/java.management/share/classes/com/sun/management/VMOption.java jdk/src/java.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java jdk/src/java.management/share/classes/com/sun/management/package-info.java jdk/src/java.management/share/classes/sun/management/DiagnosticCommandArgumentInfo.java jdk/src/java.management/share/classes/sun/management/DiagnosticCommandImpl.java jdk/src/java.management/share/classes/sun/management/DiagnosticCommandInfo.java jdk/src/java.management/share/classes/sun/management/Flag.java jdk/src/java.management/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java jdk/src/java.management/share/classes/sun/management/GcInfoBuilder.java jdk/src/java.management/share/classes/sun/management/GcInfoCompositeData.java jdk/src/java.management/share/classes/sun/management/HotSpotDiagnostic.java jdk/src/java.management/share/classes/sun/management/ManagementFactory.java jdk/src/java.management/share/classes/sun/management/VMOptionCompositeData.java jdk/src/java.management/share/native/libmanagement/DiagnosticCommandImpl.c jdk/src/java.management/share/native/libmanagement/Flag.c jdk/src/java.management/share/native/libmanagement/GcInfoBuilder.c jdk/src/java.management/share/native/libmanagement/HotSpotDiagnostic.c jdk/src/java.management/unix/classes/sun/management/OperatingSystemImpl.java jdk/src/java.management/unix/native/libmanagement/LinuxOperatingSystem.c jdk/src/java.management/unix/native/libmanagement/MacosxOperatingSystem.c jdk/src/java.management/unix/native/libmanagement/OperatingSystemImpl.c jdk/src/java.management/unix/native/libmanagement/SolarisOperatingSystem.c jdk/src/java.management/windows/classes/sun/management/OperatingSystemImpl.java jdk/src/java.management/windows/native/libmanagement/OperatingSystemImpl.c jdk/test/java/lang/management/ThreadMXBean/Semaphore.java jdk/test/sun/management/jmxremote/startstop/JMXStartStopDoSomething.java |
| diffstat | 1561 files changed, 38887 insertions(+), 29026 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags-top-repo Thu May 07 20:49:48 2015 -0700 +++ b/.hgtags-top-repo Wed Jul 05 20:32:26 2017 +0200 @@ -305,3 +305,4 @@ 9fa2185bee17462d1014538bff60af6e6f0b01e7 jdk9-b60 ea38728b4f4bdd8fd0d7a89b18069f521cf05013 jdk9-b61 105d045a69174d870b69bfe471b3f2d05a9f8ecc jdk9-b62 +0b32ed628fa60e4ab99fb0b5866d648e16231f17 jdk9-b63
--- a/common/autoconf/basics_windows.m4 Thu May 07 20:49:48 2015 -0700 +++ b/common/autoconf/basics_windows.m4 Wed Jul 05 20:32:26 2017 +0200 @@ -320,8 +320,8 @@ WINDOWS_ENV_VENDOR='cygwin' WINDOWS_ENV_VERSION="$CYGWIN_VERSION" - CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.` - if test "x$CYGWIN_VERSION_OK" = x; then + CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $GREP -e '^1\.[0-6]'` + if test "x$CYGWIN_VERSION_OLD" != x; then AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade.]) AC_MSG_ERROR([Cannot continue]) fi
--- a/common/autoconf/boot-jdk.m4 Thu May 07 20:49:48 2015 -0700 +++ b/common/autoconf/boot-jdk.m4 Wed Jul 05 20:32:26 2017 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -306,7 +306,6 @@ BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac) BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAH, javah) BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR, jar) - BOOTJDK_CHECK_TOOL_IN_BOOTJDK(NATIVE2ASCII, native2ascii) BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JARSIGNER, jarsigner) # Finally, set some other options...
--- a/common/autoconf/bootcycle-spec.gmk.in Thu May 07 20:49:48 2015 -0700 +++ b/common/autoconf/bootcycle-spec.gmk.in Wed Jul 05 20:32:26 2017 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -57,6 +57,5 @@ JAVAC_CMD:=$(BOOT_JDK)/bin/javac JAVAH_CMD:=$(BOOT_JDK)/bin/javah JAR_CMD:=$(BOOT_JDK)/bin/jar -NATIVE2ASCII_CMD:=$(BOOT_JDK)/bin/native2ascii JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD)
--- a/common/autoconf/flags.m4 Thu May 07 20:49:48 2015 -0700 +++ b/common/autoconf/flags.m4 Wed Jul 05 20:32:26 2017 +0200 @@ -65,12 +65,6 @@ fi AC_SUBST(POST_STRIP_CMD) - if test "x$OPENJDK_TARGET_OS" = xsolaris; then - # FIXME: break out into MCSFLAGS - POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\"" - fi - AC_SUBST(POST_MCS_CMD) - if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then CC_OUT_OPTION=-Fo EXE_OUT_OPTION=-out:
--- a/common/autoconf/generated-configure.sh Thu May 07 20:49:48 2015 -0700 +++ b/common/autoconf/generated-configure.sh Wed Jul 05 20:32:26 2017 +0200 @@ -737,7 +737,6 @@ LD_OUT_OPTION EXE_OUT_OPTION CC_OUT_OPTION -POST_MCS_CMD POST_STRIP_CMD ARFLAGS COMPILER_TARGET_BITS_FLAG @@ -759,7 +758,6 @@ OBJCOPY ac_ct_NM ac_ct_STRIP -MCS GNM NM STRIP @@ -820,7 +818,6 @@ JAVAC_FLAGS BOOT_JDK_SOURCETARGET JARSIGNER -NATIVE2ASCII JAR JAVAH JAVAC @@ -1189,7 +1186,6 @@ JAVAC JAVAH JAR -NATIVE2ASCII JARSIGNER CC CFLAGS @@ -1207,7 +1203,6 @@ STRIP NM GNM -MCS OBJCOPY OBJDUMP BUILD_CC @@ -2070,8 +2065,6 @@ JAVAC Override default value for JAVAC JAVAH Override default value for JAVAH JAR Override default value for JAR - NATIVE2ASCII - Override default value for NATIVE2ASCII JARSIGNER Override default value for JARSIGNER CC C compiler command CFLAGS C compiler flags @@ -2090,7 +2083,6 @@ STRIP Override default value for STRIP NM Override default value for NM GNM Override default value for GNM - MCS Override default value for MCS OBJCOPY Override default value for OBJCOPY OBJDUMP Override default value for OBJDUMP BUILD_CC Override default value for BUILD_CC @@ -3599,7 +3591,7 @@ # ... then the rest # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -4367,7 +4359,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1430331133 +DATE_WHEN_GENERATED=1430918902 ############################################################################### # @@ -14052,8 +14044,8 @@ WINDOWS_ENV_VENDOR='cygwin' WINDOWS_ENV_VERSION="$CYGWIN_VERSION" - CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.` - if test "x$CYGWIN_VERSION_OK" = x; then + CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $GREP -e '^1\.0-6'` + if test "x$CYGWIN_VERSION_OLD" != x; then { $as_echo "$as_me:${as_lineno-$LINENO}: Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade." >&5 $as_echo "$as_me: Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade." >&6;} as_fn_error $? "Cannot continue" "$LINENO" 5 @@ -26059,133 +26051,6 @@ # Publish this variable in the help. - if test "x$NATIVE2ASCII" = x; then - # The variable is not set by user, try to locate tool using the code snippet - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native2ascii in Boot JDK" >&5 -$as_echo_n "checking for native2ascii in Boot JDK... " >&6; } - NATIVE2ASCII=$BOOT_JDK/bin/native2ascii - if test ! -x $NATIVE2ASCII; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 -$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;} - as_fn_error $? "Could not find native2ascii in the Boot JDK" "$LINENO" 5 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - - - else - # The variable is set, but is it from the command line or the environment? - - # Try to remove the string !NATIVE2ASCII! from our list. - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!NATIVE2ASCII!/} - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then - # If it failed, the variable was not from the command line. Ignore it, - # but warn the user (except for BASH, which is always set by the calling BASH). - if test "xNATIVE2ASCII" != xBASH; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of NATIVE2ASCII from the environment. Use command line variables instead." >&5 -$as_echo "$as_me: WARNING: Ignoring value of NATIVE2ASCII from the environment. Use command line variables instead." >&2;} - fi - # Try to locate tool using the code snippet - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native2ascii in Boot JDK" >&5 -$as_echo_n "checking for native2ascii in Boot JDK... " >&6; } - NATIVE2ASCII=$BOOT_JDK/bin/native2ascii - if test ! -x $NATIVE2ASCII; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5 -$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;} - as_fn_error $? "Could not find native2ascii in the Boot JDK" "$LINENO" 5 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - - - else - # If it succeeded, then it was overridden by the user. We will use it - # for the tool. - - # First remove it from the list of overridden variables, so we can test - # for unknown variables in the end. - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var" - - # Check if the provided tool contains a complete path. - tool_specified="$NATIVE2ASCII" - tool_basename="${tool_specified##*/}" - if test "x$tool_basename" = "x$tool_specified"; then - # A command without a complete path is provided, search $PATH. - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool NATIVE2ASCII=$tool_basename" >&5 -$as_echo "$as_me: Will search for user supplied tool NATIVE2ASCII=$tool_basename" >&6;} - # Extract the first word of "$tool_basename", so it can be a program name with args. -set dummy $tool_basename; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_NATIVE2ASCII+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $NATIVE2ASCII in - [\\/]* | ?:[\\/]*) - ac_cv_path_NATIVE2ASCII="$NATIVE2ASCII" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_NATIVE2ASCII="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -NATIVE2ASCII=$ac_cv_path_NATIVE2ASCII -if test -n "$NATIVE2ASCII"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NATIVE2ASCII" >&5 -$as_echo "$NATIVE2ASCII" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "x$NATIVE2ASCII" = x; then - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5 - fi - else - # Otherwise we believe it is a complete path. Use it as it is. - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool NATIVE2ASCII=$tool_specified" >&5 -$as_echo "$as_me: Will use user supplied tool NATIVE2ASCII=$tool_specified" >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NATIVE2ASCII" >&5 -$as_echo_n "checking for NATIVE2ASCII... " >&6; } - if test ! -x "$tool_specified"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - as_fn_error $? "User supplied tool NATIVE2ASCII=$tool_specified does not exist or is not executable" "$LINENO" 5 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5 -$as_echo "$tool_specified" >&6; } - fi - fi - fi - - - - # Use user overridden value if available, otherwise locate tool in the Boot JDK. - - # Publish this variable in the help. - - if test "x$JARSIGNER" = x; then # The variable is not set by user, try to locate tool using the code snippet @@ -28232,7 +28097,7 @@ # For solaris we really need solaris tools, and not the GNU equivalent. # The build tools on Solaris reside in /usr/ccs (C Compilation System), # so add that to path before starting to probe. - # FIXME: This was originally only done for AS,NM,GNM,STRIP,MCS,OBJCOPY,OBJDUMP. + # FIXME: This was originally only done for AS,NM,GNM,STRIP,OBJCOPY,OBJDUMP. if test "x$OPENJDK_BUILD_OS" = xsolaris; then PATH="/usr/ccs/bin:$PATH" fi @@ -36672,479 +36537,6 @@ fi fi - - - - # Publish this variable in the help. - - - if test "x$MCS" = x; then - # The variable is not set by user, try to locate tool using the code snippet - for ac_prog in mcs -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MCS+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MCS in - [\\/]* | ?:[\\/]*) - ac_cv_path_MCS="$MCS" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -MCS=$ac_cv_path_MCS -if test -n "$MCS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5 -$as_echo "$MCS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$MCS" && break -done - - else - # The variable is set, but is it from the command line or the environment? - - # Try to remove the string !MCS! from our list. - try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!MCS!/} - if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then - # If it failed, the variable was not from the command line. Ignore it, - # but warn the user (except for BASH, which is always set by the calling BASH). - if test "xMCS" != xBASH; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of MCS from the environment. Use command line variables instead." >&5 -$as_echo "$as_me: WARNING: Ignoring value of MCS from the environment. Use command line variables instead." >&2;} - fi - # Try to locate tool using the code snippet - for ac_prog in mcs -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MCS+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MCS in - [\\/]* | ?:[\\/]*) - ac_cv_path_MCS="$MCS" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -MCS=$ac_cv_path_MCS -if test -n "$MCS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5 -$as_echo "$MCS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$MCS" && break -done - - else - # If it succeeded, then it was overridden by the user. We will use it - # for the tool. - - # First remove it from the list of overridden variables, so we can test - # for unknown variables in the end. - CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var" - - # Check if the provided tool contains a complete path. - tool_specified="$MCS" - tool_basename="${tool_specified##*/}" - if test "x$tool_basename" = "x$tool_specified"; then - # A command without a complete path is provided, search $PATH. - { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool MCS=$tool_basename" >&5 -$as_echo "$as_me: Will search for user supplied tool MCS=$tool_basename" >&6;} - # Extract the first word of "$tool_basename", so it can be a program name with args. -set dummy $tool_basename; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MCS+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MCS in - [\\/]* | ?:[\\/]*) - ac_cv_path_MCS="$MCS" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -MCS=$ac_cv_path_MCS -if test -n "$MCS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5 -$as_echo "$MCS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "x$MCS" = x; then - as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5 - fi - else - # Otherwise we believe it is a complete path. Use it as it is. - { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool MCS=$tool_specified" >&5 -$as_echo "$as_me: Will use user supplied tool MCS=$tool_specified" >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCS" >&5 -$as_echo_n "checking for MCS... " >&6; } - if test ! -x "$tool_specified"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - as_fn_error $? "User supplied tool MCS=$tool_specified does not exist or is not executable" "$LINENO" 5 - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5 -$as_echo "$tool_specified" >&6; } - fi - fi - fi - - - - # Only process if variable expands to non-empty - - if test "x$MCS" != x; then - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then - - # First separate the path from the arguments. This will split at the first - # space. - complete="$MCS" - path="${complete%% *}" - tmp="$complete EOL" - arguments="${tmp#* }" - - # Input might be given as Windows format, start by converting to - # unix format. - new_path=`$CYGPATH -u "$path"` - - # Now try to locate executable using which - new_path=`$WHICH "$new_path" 2> /dev/null` - # bat and cmd files are not always considered executable in cygwin causing which - # to not find them - if test "x$new_path" = x \ - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ - && test "x`$LS \"$path\" 2>/dev/null`" != x; then - new_path=`$CYGPATH -u "$path"` - fi - if test "x$new_path" = x; then - # Oops. Which didn't find the executable. - # The splitting of arguments from the executable at a space might have been incorrect, - # since paths with space are more likely in Windows. Give it another try with the whole - # argument. - path="$complete" - arguments="EOL" - new_path=`$CYGPATH -u "$path"` - new_path=`$WHICH "$new_path" 2> /dev/null` - # bat and cmd files are not always considered executable in cygwin causing which - # to not find them - if test "x$new_path" = x \ - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ - && test "x`$LS \"$path\" 2>/dev/null`" != x; then - new_path=`$CYGPATH -u "$path"` - fi - if test "x$new_path" = x; then - # It's still not found. Now this is an unrecoverable error. - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5 -$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;} - has_space=`$ECHO "$complete" | $GREP " "` - if test "x$has_space" != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} - fi - as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5 - fi - fi - - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then - # "foo.exe" is OK but "foo" is an error. - # - # This test is therefore slightly more accurate than "test -f" to check for file presence. - # It is also a way to make sure we got the proper file name for the real test later on. - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null` - if test "x$test_shortpath" = x; then - # Short path failed, file does not exist as specified. - # Try adding .exe or .cmd - if test -f "${new_path}.exe"; then - input_to_shortpath="${new_path}.exe" - elif test -f "${new_path}.cmd"; then - input_to_shortpath="${new_path}.cmd" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$new_path\", is invalid." >&5 -$as_echo "$as_me: The path of MCS, which resolves as \"$new_path\", is invalid." >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&5 -$as_echo "$as_me: Neither \"$new_path\" nor \"$new_path.exe/cmd\" can be found" >&6;} - as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5 - fi - else - input_to_shortpath="$new_path" - fi - - # Call helper function which possibly converts this using DOS-style short mode. - # If so, the updated path is stored in $new_path. - new_path="$input_to_shortpath" - - input_path="$input_to_shortpath" - # Check if we need to convert this using DOS-style short mode. If the path - # contains just simple characters, use it. Otherwise (spaces, weird characters), - # take no chances and rewrite it. - # Note: m4 eats our [], so we need to use [ and ] instead. - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]` - if test "x$has_forbidden_chars" != x; then - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) - shortmode_path=`$CYGPATH -s -m -a "$input_path"` - path_after_shortmode=`$CYGPATH -u "$shortmode_path"` - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then - # Going to short mode and back again did indeed matter. Since short mode is - # case insensitive, let's make it lowercase to improve readability. - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - # Now convert it back to Unix-style (cygpath) - input_path=`$CYGPATH -u "$shortmode_path"` - new_path="$input_path" - fi - fi - - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/` - if test "x$test_cygdrive_prefix" = x; then - # As a simple fix, exclude /usr/bin since it's not a real path. - if test "x`$ECHO $input_to_shortpath | $GREP ^/usr/bin/`" = x; then - # The path is in a Cygwin special directory (e.g. /home). We need this converted to - # a path prefixed by /cygdrive for fixpath to work. - new_path="$CYGWIN_ROOT_PATH$input_path" - fi - fi - - # remove trailing .exe if any - new_path="${new_path/%.exe/}" - - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then - - # First separate the path from the arguments. This will split at the first - # space. - complete="$MCS" - path="${complete%% *}" - tmp="$complete EOL" - arguments="${tmp#* }" - - # Input might be given as Windows format, start by converting to - # unix format. - new_path="$path" - - windows_path="$new_path" - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then - unix_path=`$CYGPATH -u "$windows_path"` - new_path="$unix_path" - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` - new_path="$unix_path" - fi - - - # Now try to locate executable using which - new_path=`$WHICH "$new_path" 2> /dev/null` - - if test "x$new_path" = x; then - # Oops. Which didn't find the executable. - # The splitting of arguments from the executable at a space might have been incorrect, - # since paths with space are more likely in Windows. Give it another try with the whole - # argument. - path="$complete" - arguments="EOL" - new_path="$path" - - windows_path="$new_path" - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then - unix_path=`$CYGPATH -u "$windows_path"` - new_path="$unix_path" - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` - new_path="$unix_path" - fi - - - new_path=`$WHICH "$new_path" 2> /dev/null` - # bat and cmd files are not always considered executable in MSYS causing which - # to not find them - if test "x$new_path" = x \ - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ - && test "x`$LS \"$path\" 2>/dev/null`" != x; then - new_path="$path" - - windows_path="$new_path" - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then - unix_path=`$CYGPATH -u "$windows_path"` - new_path="$unix_path" - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` - new_path="$unix_path" - fi - - fi - - if test "x$new_path" = x; then - # It's still not found. Now this is an unrecoverable error. - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5 -$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;} - has_space=`$ECHO "$complete" | $GREP " "` - if test "x$has_space" != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: You might be mixing spaces in the path and extra arguments, which is not allowed." >&5 -$as_echo "$as_me: You might be mixing spaces in the path and extra arguments, which is not allowed." >&6;} - fi - as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5 - fi - fi - - # Now new_path has a complete unix path to the binary - if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then - # Keep paths in /bin as-is, but remove trailing .exe if any - new_path="${new_path/%.exe/}" - # Do not save /bin paths to all_fixpath_prefixes! - else - # Not in mixed or Windows style, start by that. - new_path=`cmd //c echo $new_path` - - input_path="$new_path" - # Check if we need to convert this using DOS-style short mode. If the path - # contains just simple characters, use it. Otherwise (spaces, weird characters), - # take no chances and rewrite it. - # Note: m4 eats our [], so we need to use [ and ] instead. - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]` - if test "x$has_forbidden_chars" != x; then - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - fi - - # Output is in $new_path - - windows_path="$new_path" - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then - unix_path=`$CYGPATH -u "$windows_path"` - new_path="$unix_path" - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` - new_path="$unix_path" - fi - - # remove trailing .exe if any - new_path="${new_path/%.exe/}" - - # Save the first 10 bytes of this path to the storage, so fixpath can work. - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}") - fi - - else - # We're on a unix platform. Hooray! :) - # First separate the path from the arguments. This will split at the first - # space. - complete="$MCS" - path="${complete%% *}" - tmp="$complete EOL" - arguments="${tmp#* }" - - # Cannot rely on the command "which" here since it doesn't always work. - is_absolute_path=`$ECHO "$path" | $GREP ^/` - if test -z "$is_absolute_path"; then - # Path to executable is not absolute. Find it. - IFS_save="$IFS" - IFS=: - for p in $PATH; do - if test -f "$p/$path" && test -x "$p/$path"; then - new_path="$p/$path" - break - fi - done - IFS="$IFS_save" - else - # This is an absolute path, we can use it without further modifications. - new_path="$path" - fi - - if test "x$new_path" = x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5 -$as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;} - has_space=`$ECHO "$complete" | $GREP " "` - if test "x$has_space" != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5 -$as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;} - fi - as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5 - fi - fi - - # Now join together the path and the arguments once again - if test "x$arguments" != xEOL; then - new_complete="$new_path ${arguments% *}" - else - new_complete="$new_path" - fi - - if test "x$complete" != "x$new_complete"; then - MCS="$new_complete" - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5 -$as_echo "$as_me: Rewriting MCS to \"$new_complete\"" >&6;} - fi - fi - elif test "x$OPENJDK_TARGET_OS" != xwindows; then # FIXME: we should unify this with the solaris case above. @@ -41632,12 +41024,6 @@ fi - if test "x$OPENJDK_TARGET_OS" = xsolaris; then - # FIXME: break out into MCSFLAGS - POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\"" - fi - - if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then CC_OUT_OPTION=-Fo EXE_OUT_OPTION=-out:
--- a/common/autoconf/spec.gmk.in Thu May 07 20:49:48 2015 -0700 +++ b/common/autoconf/spec.gmk.in Wed Jul 05 20:32:26 2017 +0200 @@ -391,7 +391,6 @@ NM:=@NM@ GNM:=@GNM@ STRIP:=@STRIP@ -MCS:=@MCS@ LIPO:=@LIPO@ @@ -440,7 +439,6 @@ OBJ_SUFFIX:=@OBJ_SUFFIX@ POST_STRIP_CMD:=@POST_STRIP_CMD@ -POST_MCS_CMD:=@POST_MCS_CMD@ JAVA_FLAGS:=@JAVA_FLAGS@ JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@ @@ -455,7 +453,6 @@ JAVAC_CMD:=@JAVAC@ JAVAH_CMD:=@JAVAH@ JAR_CMD:=@JAR@ -NATIVE2ASCII_CMD:=@NATIVE2ASCII@ JARSIGNER_CMD:=@JARSIGNER@ SJAVAC_SERVER_JAVA_CMD:=@SJAVAC_SERVER_JAVA@ # These variables are meant to be used. They are defined with = instead of := to make @@ -465,7 +462,6 @@ JAVAC=@FIXPATH@ $(JAVAC_CMD) JAVAH=@FIXPATH@ $(JAVAH_CMD) JAR=@FIXPATH@ $(JAR_CMD) -NATIVE2ASCII=@FIXPATH@ $(NATIVE2ASCII_CMD) $(JAVA_TOOL_FLAGS_SMALL) JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD) # A specific java binary with specific options can be used to run # the long running background sjavac servers and other long running tasks. @@ -692,10 +688,10 @@ SYMBOLS_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(SYMBOLS_IMAGE_SUBDIR) # Macosx bundles directory definitions -JDK_BUNDLE_SUBDIR=jdk-bundle/jdk$(JDK_VERSION).jdk/Contents -JRE_BUNDLE_SUBDIR=jre-bundle/jre$(JDK_VERSION).jre/Contents -JDK_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_BUNDLE_SUBDIR) -JRE_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR) +JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle/jdk$(JDK_VERSION).jdk/Contents +JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle/jre$(JDK_VERSION).jre/Contents +JDK_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR) +JRE_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR) # This macro is called to allow inclusion of closed source counterparts. # Unless overridden in closed sources, it expands to nothing.
--- a/common/autoconf/toolchain.m4 Thu May 07 20:49:48 2015 -0700 +++ b/common/autoconf/toolchain.m4 Wed Jul 05 20:32:26 2017 +0200 @@ -210,7 +210,7 @@ # For solaris we really need solaris tools, and not the GNU equivalent. # The build tools on Solaris reside in /usr/ccs (C Compilation System), # so add that to path before starting to probe. - # FIXME: This was originally only done for AS,NM,GNM,STRIP,MCS,OBJCOPY,OBJDUMP. + # FIXME: This was originally only done for AS,NM,GNM,STRIP,OBJCOPY,OBJDUMP. if test "x$OPENJDK_BUILD_OS" = xsolaris; then PATH="/usr/ccs/bin:$PATH" fi @@ -569,9 +569,6 @@ BASIC_FIXUP_EXECUTABLE(NM) BASIC_PATH_PROGS(GNM, gnm) BASIC_FIXUP_EXECUTABLE(GNM) - - BASIC_PATH_PROGS(MCS, mcs) - BASIC_FIXUP_EXECUTABLE(MCS) elif test "x$OPENJDK_TARGET_OS" != xwindows; then # FIXME: we should unify this with the solaris case above. BASIC_CHECK_TOOLS(STRIP, strip)
--- a/common/bin/unshuffle_list.txt Thu May 07 20:49:48 2015 -0700 +++ b/common/bin/unshuffle_list.txt Wed Jul 05 20:32:26 2017 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -1156,7 +1156,6 @@ jdk/src/java.management/share/classes/com/sun/jmx/interceptor : jdk/src/share/classes/com/sun/jmx/interceptor jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver : jdk/src/share/classes/com/sun/jmx/mbeanserver jdk/src/java.management/share/classes/com/sun/jmx/remote : jdk/src/share/classes/com/sun/jmx/remote -jdk/src/java.management/share/classes/com/sun/management : jdk/src/share/classes/com/sun/management jdk/src/java.management/share/classes/java/lang/management : jdk/src/share/classes/java/lang/management jdk/src/java.management/share/classes/javax/management : jdk/src/share/classes/javax/management jdk/src/java.management/share/classes/mgmt-overview.html : jdk/src/share/classes/com/sun/management/mgmt-overview.html @@ -1429,6 +1428,7 @@ jdk/src/jdk.localedata/share/classes/sun/util/resources/uk : jdk/src/share/classes/sun/util/resources/uk jdk/src/jdk.localedata/share/classes/sun/util/resources/vi : jdk/src/share/classes/sun/util/resources/vi jdk/src/jdk.localedata/share/classes/sun/util/resources/zh : jdk/src/share/classes/sun/util/resources/zh +jdk/src/jdk.management/share/classes/com/sun/management : jdk/src/share/classes/com/sun/management jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns : jdk/src/share/classes/com/sun/jndi/dns jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns : jdk/src/share/classes/com/sun/jndi/url/dns jdk/src/jdk.naming.dns/share/classes/META-INF/services : jdk/src/share/classes/sun/net/spi/nameservice/dns/META-INF/services
--- a/corba/.hgtags Thu May 07 20:49:48 2015 -0700 +++ b/corba/.hgtags Wed Jul 05 20:32:26 2017 +0200 @@ -305,3 +305,4 @@ caa330b275f39282793466529f6864766b31d9fd jdk9-b60 d690f489ca0bb95a6157d996da2fa72bcbcf02ea jdk9-b61 d27f7e0a7aca129969de23e9934408a31b4abf4c jdk9-b62 +0acac6937de7a0868f8c6f88b7d036d780abeee6 jdk9-b63
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -222,7 +222,7 @@ /** * returns the type of the element contained in the Any. * - * @result the TypeCode for the element in the Any + * @return the TypeCode for the element in the Any */ public TypeCode type() { return typeCode; @@ -267,7 +267,7 @@ * checks for equality between Anys. * * @param otherAny the Any to be compared with. - * @result true if the Anys are equal, false otherwise. + * @return true if the Anys are equal, false otherwise. */ public boolean equal(Any otherAny) { @@ -508,7 +508,7 @@ /** * returns an output stream that an Any value can be marshaled into. * - * @result the OutputStream to marshal value of Any into + * @return the OutputStream to marshal value of Any into */ public org.omg.CORBA.portable.OutputStream create_output_stream() { @@ -525,7 +525,7 @@ /** * returns an input stream that an Any value can be marshaled out of. * - * @result the InputStream to marshal value of Any out of. + * @return the InputStream to marshal value of Any out of. */ public org.omg.CORBA.portable.InputStream create_input_stream() {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java Wed Jul 05 20:32:26 2017 +0200 @@ -166,7 +166,7 @@ * Write the contents of the CDROutputStream to the specified * output stream. Has the side-effect of pushing any current * Message onto the Message list. - * @param s The output stream to write to. + * @param connection The output stream to write to. */ public void writeTo(CorbaConnection connection) throws java.io.IOException
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java Wed Jul 05 20:32:26 2017 +0200 @@ -54,8 +54,9 @@ * use NIO ByteBuffer and NIO CharBuffer, the interaction * and interface between this class and the CDR streams * should be looked at more closely for optimizations to - * avoid unnecessary copying of data between char[] & - * CharBuffer and byte[] & ByteBuffer, especially + * avoid unnecessary copying of data between + * {@code char[] & CharBuffer} and + * {@code byte[] & ByteBuffer}, especially * DirectByteBuffers. * */
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -171,9 +171,9 @@ * @param out The stream to write the value to * @param value The value to be written to the stream **/ - public void writeValue(org.omg.CORBA.portable.OutputStream _out, + public void writeValue(org.omg.CORBA.portable.OutputStream out, java.io.Serializable value) { - writeValueWithVersion(_out, value, STREAM_FORMAT_VERSION_1); + writeValueWithVersion(out, value, STREAM_FORMAT_VERSION_1); } private void writeValueWithVersion(org.omg.CORBA.portable.OutputStream _out, @@ -240,25 +240,25 @@ * Reads a value from the stream using java semantics. * @param in The stream to read the value from * @param clazz The type of the value to be read in - * @param sender The sending context runtime + * @param rt The sending context runtime **/ - public java.io.Serializable readValue(org.omg.CORBA.portable.InputStream _in, + public java.io.Serializable readValue(org.omg.CORBA.portable.InputStream in, int offset, java.lang.Class clazz, String repositoryID, - org.omg.SendingContext.RunTime _sender) + org.omg.SendingContext.RunTime rt) { // Must use narrow rather than a direct cast to a com.sun // class. Fix for bug 4379539. - CodeBase sender = CodeBaseHelper.narrow(_sender); + CodeBase sender = CodeBaseHelper.narrow(rt); - org.omg.CORBA_2_3.portable.InputStream in = - (org.omg.CORBA_2_3.portable.InputStream) _in; + org.omg.CORBA_2_3.portable.InputStream inStream = + (org.omg.CORBA_2_3.portable.InputStream) in; if (!useHashtables) { if (inputStreamBridge == null) { inputStreamBridge = createInputStream(); - inputStreamBridge.setOrbStream(in); + inputStreamBridge.setOrbStream(inStream); inputStreamBridge.setSender(sender); //d11638 // backward compatability 4365188 inputStreamBridge.setValueHandler(this); @@ -269,7 +269,7 @@ try { inputStreamBridge.increaseRecursionDepth(); - result = (java.io.Serializable) readValueInternal(inputStreamBridge, in, offset, clazz, repositoryID, sender); + result = (java.io.Serializable) readValueInternal(inputStreamBridge, inStream, offset, clazz, repositoryID, sender); } finally { @@ -287,16 +287,16 @@ if (inputStreamPairs == null) inputStreamPairs = new Hashtable(); - jdkToOrbInputStreamBridge = (IIOPInputStream)inputStreamPairs.get(_in); + jdkToOrbInputStreamBridge = (IIOPInputStream)inputStreamPairs.get(in); if (jdkToOrbInputStreamBridge == null) { jdkToOrbInputStreamBridge = createInputStream(); - jdkToOrbInputStreamBridge.setOrbStream(in); + jdkToOrbInputStreamBridge.setOrbStream(inStream); jdkToOrbInputStreamBridge.setSender(sender); //d11638 // backward compatability 4365188 jdkToOrbInputStreamBridge.setValueHandler(this); - inputStreamPairs.put(_in, jdkToOrbInputStreamBridge); + inputStreamPairs.put(in, jdkToOrbInputStreamBridge); } java.io.Serializable result = null; @@ -304,12 +304,12 @@ try { jdkToOrbInputStreamBridge.increaseRecursionDepth(); - result = (java.io.Serializable) readValueInternal(jdkToOrbInputStreamBridge, in, offset, clazz, repositoryID, sender); + result = (java.io.Serializable) readValueInternal(jdkToOrbInputStreamBridge, inStream, offset, clazz, repositoryID, sender); } finally { if (jdkToOrbInputStreamBridge.decreaseRecursionDepth() == 0) { - inputStreamPairs.remove(_in); + inputStreamPairs.remove(in); } }
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java Wed Jul 05 20:32:26 2017 +0200 @@ -33,7 +33,6 @@ import com.sun.corba.se.spi.ior.Identifiable ; /** - * @author * This is used for unknown components and profiles. A TAG_MULTICOMPONENT_PROFILE will be represented this way. */ public abstract class GenericIdentifiable implements Identifiable
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java Wed Jul 05 20:32:26 2017 +0200 @@ -34,9 +34,6 @@ import com.sun.corba.se.spi.ior.TaggedComponent ; -/** - * @author - */ public class GenericTaggedComponent extends GenericIdentifiable implements TaggedComponent { @@ -52,8 +49,6 @@ /** * @return org.omg.IOP.TaggedComponent - * @exception - * @author */ public org.omg.IOP.TaggedComponent getIOPComponent( ORB orb ) {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java Wed Jul 05 20:32:26 2017 +0200 @@ -39,9 +39,6 @@ import com.sun.corba.se.impl.encoding.EncapsOutputStream ; -/** - * @author - */ public class GenericTaggedProfile extends GenericIdentifiable implements TaggedProfile { private ORB orb ;
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -47,7 +47,6 @@ /** * This class is a container of TaggedProfileTemplates. - * @author */ public class IORTemplateImpl extends IdentifiableContainerBase implements IORTemplate {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java Wed Jul 05 20:32:26 2017 +0200 @@ -31,7 +31,7 @@ /** ObjectAdapterIdNumber is used to represent pre-JDK 1.4 POA adapter * IDs. The POA ID was simply represented as a single integer, which was * mapped to the actual POA instance. Here, we just represent these - * internally as arrays of the form { "OldRootPOA", "<number>" }, + * internally as arrays of the form {@code { "OldRootPOA", "<number>" }}, * and provide an extra method to get the number back. */ public class ObjectAdapterIdNumber extends ObjectAdapterIdArray {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -29,9 +29,6 @@ import com.sun.corba.se.spi.ior.ObjectId ; import org.omg.CORBA_2_3.portable.OutputStream ; -/** - * @author - */ public final class ObjectIdImpl implements ObjectId { private byte[] id;
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -37,9 +37,6 @@ import com.sun.corba.se.impl.encoding.EncapsOutputStream ; -/** - * @author - */ public class ObjectKeyImpl implements ObjectKey { private ObjectKeyTemplate oktemp;
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java Wed Jul 05 20:32:26 2017 +0200 @@ -47,9 +47,6 @@ import com.sun.corba.se.impl.logging.IORSystemException ; -/** - * @author - */ public abstract class ObjectKeyTemplateBase implements ObjectKeyTemplate { // Fixed constants for Java IDL object key template forms
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java Wed Jul 05 20:32:26 2017 +0200 @@ -42,9 +42,6 @@ import com.sun.corba.se.impl.ior.ObjectKeyFactoryImpl ; -/** - * @author - */ public final class POAObjectKeyTemplate extends NewObjectKeyTemplateBase { /** This constructor reads the template ONLY from the stream.
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -245,7 +245,7 @@ /** * Returns a string representation of this stub. Returns the same string * for all stubs that represent the same remote object. - * "SimpleIORImpl[<typeName>,[<profileID>]data, ...]" + * {@code "SimpleIORImpl[<typeName>,[<profileID>]data, ...]"} * @return a string representation of this stub. */ public String toString()
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -33,9 +33,6 @@ import org.omg.CORBA_2_3.portable.InputStream ; -/** - * @author - */ public class TaggedProfileFactoryFinderImpl extends IdentifiableFactoryFinderBase {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -35,9 +35,6 @@ import org.omg.CORBA.INTERNAL ; -/** - * @author - */ public class TaggedProfileTemplateFactoryFinderImpl extends IdentifiableFactoryFinderBase {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -38,9 +38,6 @@ import com.sun.corba.se.impl.encoding.MarshalOutputStream ; import com.sun.corba.se.impl.encoding.MarshalInputStream ; -/** - * @author - */ public class CodeSetsComponentImpl extends TaggedComponentBase implements CodeSetsComponent {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java Wed Jul 05 20:32:26 2017 +0200 @@ -32,9 +32,6 @@ import com.sun.corba.se.spi.ior.iiop.IIOPAddress ; -/** - * @author - */ abstract class IIOPAddressBase implements IIOPAddress { // Ports are marshalled as shorts on the wire. The IDL
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -32,9 +32,6 @@ import com.sun.corba.se.spi.orbutil.closure.Closure ; -/** - * @author - */ public final class IIOPAddressClosureImpl extends IIOPAddressBase { private Closure host;
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -36,9 +36,6 @@ import com.sun.corba.se.impl.logging.IORSystemException ; -/** - * @author - */ public final class IIOPAddressImpl extends IIOPAddressBase { private ORB orb ;
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -76,9 +76,6 @@ import com.sun.corba.se.impl.logging.IORSystemException; -/** - * @author - */ public class IIOPProfileImpl extends IdentifiableBase implements IIOPProfile { private ORB orb ;
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -55,7 +55,6 @@ import com.sun.corba.se.spi.orb.ORB ; /** - * @author * If getMinorVersion==0, this does not contain any tagged components */ public class IIOPProfileTemplateImpl extends TaggedProfileTemplateBase
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -33,9 +33,6 @@ import com.sun.corba.se.spi.ior.iiop.JavaCodebaseComponent ; -/** - * @author - */ public class JavaCodebaseComponentImpl extends TaggedComponentBase implements JavaCodebaseComponent {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java Wed Jul 05 20:32:26 2017 +0200 @@ -593,7 +593,7 @@ * @param className the name of the class. * @param remoteCodebase a space-separated list of URLs at which * the class might be found. May be null. - * @param loadingContext a class whose ClassLoader may be used to + * @param loader a class whose ClassLoader may be used to * load the class if all other methods fail. * @return the <code>Class</code> object representing the loaded class. * @exception ClassNotFoundException if class cannot be loaded.
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -92,7 +92,7 @@ * Return the next n bindings. It also returns true or false, indicating * whether there were more bindings. * @param how_many The number of requested bindings in the BindingList. - * @param bl The BindingList as an out parameter. + * @param blh The BindingList as an out parameter. * @return true if there were more bindings. * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA * system exceptions. @@ -114,7 +114,7 @@ * scope, It will be called from NamingContext.list() operation or * this.next_n(). * @param how_many The number of requested bindings in the BindingList. - * @param bl The BindingList as an out parameter. + * @param blh The BindingList as an out parameter. * @return true if there were more bindings. */ public boolean list( int how_many, org.omg.CosNaming.BindingListHolder blh)
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -181,7 +181,7 @@ * exists. The NamingContext will participate in recursive resolving. * @param n a sequence of NameComponents which is the name under which * the object will be bound. - * @param obj the NamingContect object reference to be bound. + * @param nc the NamingContext object reference to be bound. * @exception org.omg.CosNaming.NamingContextPackage.NotFound A name with * multiple components was supplied, but the first component could not be * resolved. @@ -278,7 +278,7 @@ * resolving. * @param n a sequence of NameComponents which is the name under which * the object will be bound. - * @param obj the object reference to be bound. + * @param nc the object reference to be bound. * @exception org.omg.CosNaming.NamingContextPackage.NotFound A name with * multiple components was supplied, but the first component could not be * resolved. @@ -853,10 +853,9 @@ /** * This operation creates a stringified name from the array of Name * components. - * @param n Name of the object <p> + * @param n Name of the object * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.<p> - * + * Indicates the name does not identify a binding. */ public String to_string(org.omg.CosNaming.NameComponent[] n) throws org.omg.CosNaming.NamingContextPackage.InvalidName @@ -882,10 +881,9 @@ /** * This operation converts a Stringified Name into an equivalent array * of Name Components. - * @param sn Stringified Name of the object <p> + * @param sn Stringified Name of the object * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.<p> - * + * Indicates the name does not identify a binding. */ public org.omg.CosNaming.NameComponent[] to_name(String sn) throws org.omg.CosNaming.NamingContextPackage.InvalidName @@ -920,14 +918,13 @@ * This operation creates a URL based "iiopname://" format name * from the Stringified Name of the object. * @param addr internet based address of the host machine where - * Name Service is running <p> - * @param sn Stringified Name of the object <p> + * Name Service is running + * @param sn Stringified Name of the object * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.<p> + * Indicates the name does not identify a binding. * @exception org.omg.CosNaming.NamingContextPackage.InvalidAddress * Indicates the internet based address of the host machine is - * incorrect <p> - * + * incorrect */ public String to_url(String addr, String sn) @@ -961,15 +958,15 @@ /** * This operation resolves the Stringified name into the object * reference. - * @param sn Stringified Name of the object <p> + * @param sn Stringified Name of the object * @exception org.omg.CosNaming.NamingContextPackage.NotFound - * Indicates there is no object reference for the given name. <p> + * Indicates there is no object reference for the given name. * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed - * Indicates that the given compound name is incorrect <p> + * Indicates that the given compound name is incorrect * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.<p> + * Indicates the name does not identify a binding. * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound - * Indicates the name is already bound.<p> + * Indicates the name is already bound. * */ public org.omg.CORBA.Object resolve_str(String sn)
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java Wed Jul 05 20:32:26 2017 +0200 @@ -90,7 +90,7 @@ /** * Create a error print stream to the supplied file. - * @param logFile the file to which error messages will go. + * @param errFile the file to which error messages will go. * @exception IOException thrown if the file cannot be opened for output. */ public static void makeErrStream(File errFile)
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java Wed Jul 05 20:32:26 2017 +0200 @@ -63,7 +63,6 @@ * @param orb a org.omg.CORBA.ORB object. * @param aTable A hashtable containing InternalBindingValues which is * the content of the TransientNamingContext. - * @param java.lang.Exception a Java exception. * @exception Exception a Java exception thrown of the base class cannot * initialize. */
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java Wed Jul 05 20:32:26 2017 +0200 @@ -85,7 +85,7 @@ * NamingContext, whose object * reference can be obtained by the initialNamingContext method. * @param orb The ORB object - * @param nameserviceName Stringified key used for INS Service registry + * @param serviceName Stringified key used for INS Service registry * @exception org.omg.CORBA.INITIALIZE Thrown if * the TransientNameService cannot initialize. */
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java Wed Jul 05 20:32:26 2017 +0200 @@ -33,7 +33,7 @@ * will be stored in this object. This object is capable of storing CorbaLoc * profiles as defined in the CorbaName grammer. * - * @Author Hemanth + * @author Hemanth */ public class CorbanameURL extends INSURLBase {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java Wed Jul 05 20:32:26 2017 +0200 @@ -32,7 +32,7 @@ * host information used in creating the Service Object reference * from the -ORBInitDef and -ORBDefaultInitDef definitions. * - * @Author Hemanth + * @author Hemanth */ public class IIOPEndpointInfo {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java Wed Jul 05 20:32:26 2017 +0200 @@ -29,7 +29,7 @@ * INS URL is a generic interface for two different types of URL's specified * in INS spec. * - * @Author Hemanth + * @author Hemanth */ public interface INSURL { public boolean getRIRFlag( );
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java Wed Jul 05 20:32:26 2017 +0200 @@ -30,7 +30,7 @@ /** * This class is the entry point to parse different types of INS URL's. * - * @Author Hemanth + * @author Hemanth */ public class INSURLHandler {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java Wed Jul 05 20:32:26 2017 +0200 @@ -36,7 +36,7 @@ /** * Utility methods for Naming. * - * @Author Hemanth + * @author Hemanth */ class Utility { private static NamingSystemException wrapper =
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java Wed Jul 05 20:32:26 2017 +0200 @@ -186,7 +186,7 @@ /** * getObjectReferenceFromKey returns the Object reference from the objectkey using POA.create_reference_with_id method * @param Object Key as String - * @returns reference an CORBA.Object. + * @return a CORBA.Object reference. */ org.omg.CORBA.Object getObjectReferenceFromKey( String key ) { @@ -205,7 +205,7 @@ /** * getObjectKey gets the Object Key from the reference using POA.reference_to_id method * @param reference an CORBA.Object. - * @returns Object Key as String + * @return Object Key as String */ String getObjectKey( org.omg.CORBA.Object reference ) {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -116,8 +116,8 @@ * Runs the super constructor. * @param orb an ORB object. * @param objKey as String - * @param TheNameService as NameService - * @param TheServantManagerImpl as ServantManagerImpl + * @param theNameService as NameService + * @param theServantManagerImpl as ServantManagerImpl * @exception java.lang.Exception a Java exception. */ @@ -223,7 +223,7 @@ * exists. The NamingContext will participate in recursive resolving. * @param n a sequence of NameComponents which is the name under which * the object will be bound. - * @param obj the NamingContect object reference to be bound. + * @param nc the NamingContect object reference to be bound. * @exception org.omg.CosNaming.NamingContextPackage.NotFound A name with multiple * components was supplied, but the first component could not be * resolved. @@ -301,7 +301,7 @@ * unbound first. The NamingContext will participate in recursive resolving. * @param n a sequence of NameComponents which is the name under which * the object will be bound. - * @param obj the object reference to be bound. + * @param nc the object reference to be bound. * @exception org.omg.CosNaming.NamingContextPackage.NotFound A name with multiple * components was supplied, but the first component could not be * resolved. @@ -907,7 +907,7 @@ * The doResolve( ) method calls Resolve( ) recursively to resolve n level * Names. * @param n a sequence of NameComponents which is the name to be resolved. - * @param bt Type of binding (as object or as context). + * @param bth Type of binding (as object or as context). * @return the object reference bound under the supplied name. * @exception org.omg.CosNaming.NamingContextPackage.NotFound Neither a NamingContext * or a Corba Object reference not found under this Name @@ -1140,10 +1140,9 @@ /** * This operation creates a stringified name from the array of Name * components. - * @param n Name of the object <p> + * @param n Name of the object * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.<p> - * + * Indicates the name does not identify a binding. */ public String to_string(org.omg.CosNaming.NameComponent[] n) throws org.omg.CosNaming.NamingContextPackage.InvalidName @@ -1167,10 +1166,9 @@ /** * This operation converts a Stringified Name into an equivalent array * of Name Components. - * @param sn Stringified Name of the object <p> + * @param sn Stringified Name of the object * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.<p> - * + * Indicates the name does not identify a binding. */ public org.omg.CosNaming.NameComponent[] to_name(String sn) throws org.omg.CosNaming.NamingContextPackage.InvalidName @@ -1204,14 +1202,13 @@ * This operation creates a URL based "iiopname://" format name * from the Stringified Name of the object. * @param addr internet based address of the host machine where - * Name Service is running <p> - * @param sn Stringified Name of the object <p> + * Name Service is running + * @param sn Stringified Name of the object * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.<p> + * Indicates the name does not identify a binding. * @exception org.omg.CosNaming.NamingContextPackage.InvalidAddress * Indicates the internet based address of the host machine is - * incorrect <p> - * + * incorrect */ public String to_url(String addr, String sn) @@ -1247,14 +1244,13 @@ /** * This operation resolves the Stringified name into the object * reference. - * @param sn Stringified Name of the object <p> + * @param sn Stringified Name of the object * @exception org.omg.CosNaming.NamingContextPackage.NotFound - * Indicates there is no object reference for the given name. <p> + * Indicates there is no object reference for the given name. * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed - * Indicates that the given compound name is incorrect <p> + * Indicates that the given compound name is incorrect * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.<p> - * + * Indicates the name does not identify a binding. */ public org.omg.CORBA.Object resolve_str(String sn) throws org.omg.CosNaming.NamingContextPackage.NotFound,
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java Wed Jul 05 20:32:26 2017 +0200 @@ -64,7 +64,6 @@ * @param orb a org.omg.CORBA.ORB object. * @param aTable A hashtable containing InternalBindingValues which is * the content of the PersistentNamingContext. - * @param java.lang.Exception a Java exception. * @exception Exception a Java exception thrown of the base class cannot * initialize. */
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -61,7 +61,7 @@ * Its characteristics include: * <UL> * <LI>There is only one OA instance of the TOA. Its OAId is { "TOA" }</LI> -* <LI>There is not adapter manager. The TOA manager ID is fixed.<LI> +* <LI>There is not adapter manager. The TOA manager ID is fixed.</LI> * <LI>State is the same as ORB state (TBD)</LI> * </UL> * Other requirements: @@ -118,7 +118,7 @@ * This will update thread Current, so that subsequent calls to * returnServant and removeCurrent from the same thread are for the * same request. - * @param request is the request containing the rest of the request + * @param info is the request containing the rest of the request */ public void getInvocationServant( OAInvocationInfo info ) {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -585,7 +585,7 @@ * Create an NVList * * @param count size of list to create - * @result NVList created + * @return NVList created * * @see NVList */ @@ -599,7 +599,7 @@ * Create an NVList corresponding to an OperationDef * * @param oper operation def to use to create list - * @result NVList created + * @return NVList created * * @see NVList */ @@ -612,7 +612,7 @@ /** * Create a NamedValue * - * @result NamedValue created + * @return NamedValue created */ public synchronized NamedValue create_named_value(String s, Any any, int flags) { @@ -623,7 +623,7 @@ /** * Create an ExceptionList * - * @result ExceptionList created + * @return ExceptionList created */ public synchronized org.omg.CORBA.ExceptionList create_exception_list() { @@ -634,7 +634,7 @@ /** * Create a ContextList * - * @result ContextList created + * @return ContextList created */ public synchronized org.omg.CORBA.ContextList create_context_list() { @@ -645,7 +645,7 @@ /** * Get the default Context object * - * @result the default Context object + * @return the default Context object */ public synchronized org.omg.CORBA.Context get_default_context() { @@ -656,7 +656,7 @@ /** * Create an Environment * - * @result Environment created + * @return Environment created */ public synchronized org.omg.CORBA.Environment create_environment() { @@ -719,7 +719,7 @@ /** * Get the next request that has gotten a response. * - * @result the next request ready with a response. + * @return the next request ready with a response. */ public org.omg.CORBA.Request get_next_response() throws org.omg.CORBA.WrongTransaction
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java Wed Jul 05 20:32:26 2017 +0200 @@ -42,8 +42,9 @@ throw new IllegalArgumentException( "Key must be >= 0." ) ; } - /** If key >= 0, return the value bound to key, or null if none. - * Throws IllegalArgumentException if key <0. + /** + * If {@code key >= 0}, return the value bound to key, or null if none. + * Throws IllegalArgumentException if {@code key < 0}. */ public Object get( int key ) { @@ -56,8 +57,9 @@ return result ; } - /** If key >= 0, bind value to the key. - * Throws IllegalArgumentException if key <0. + /** + * If {@code key >= 0}, bind value to the key. + * Throws IllegalArgumentException if {@code key < 0}. */ public void set( int key, Object value ) {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java Wed Jul 05 20:32:26 2017 +0200 @@ -35,7 +35,7 @@ * <code>AccessController.doPrivileged</code>. * * <p>The following code retrieves the value of the system - * property named <code>"prop"</code> as a privileged action: <p> + * property named <code>"prop"</code> as a privileged action: * * <pre> * String s = (String) java.security.AccessController.doPrivileged( @@ -67,7 +67,7 @@ * value of that property. * * @param theProp the name of the system property. - * @param defaulVal the default value. + * @param defaultVal the default value. */ public GetPropertyAction(String theProp, String defaultVal) { this.theProp = theProp;
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/CondVar.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/CondVar.java Wed Jul 05 20:32:26 2017 +0200 @@ -150,8 +150,7 @@ * * </pre> * @see Mutex - * <p>[<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"> Introduction to this package. </a>] - + * [<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"> Introduction to this package. </a>] **/ public class CondVar {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java Wed Jul 05 20:32:26 2017 +0200 @@ -126,7 +126,6 @@ * // ... other similar traversal and update methods ... * } * </pre> - * <p> * @see Semaphore * <p>[<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"> Introduction to this package. </a>] **/
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java Wed Jul 05 20:32:26 2017 +0200 @@ -181,11 +181,11 @@ * } * } * } - *</pre> + * </pre> * <p> * Here is an even fancier version, that uses lock re-ordering * upon conflict: - * <pre> + * <pre>{@code * class Cell { * long value; * Sync lock = ...; @@ -214,8 +214,8 @@ * } * catch (InterruptedException ex) { return; } * } - *} - *</pre> + * } + * }</pre> * <p> * Interruptions are in general handled as early as possible. * Normally, InterruptionExceptions are thrown @@ -248,7 +248,7 @@ * it is normally best to just use acquire(), various forms * of busy waits can be implemented. For a simple example * (but one that would probably never be preferable to using acquire()): - * <pre> + * <pre>{@code * class X { * Sync lock = ... * void spinUntilAcquired() throws InterruptedException { @@ -269,17 +269,16 @@ * } * } * } - * </pre> + * }</pre> * <p> * In addition pure synchronization control, Syncs * may be useful in any context requiring before/after methods. * For example, you can use an ObservableSync * (perhaps as part of a LayeredSync) in order to obtain callbacks * before and after each method invocation for a given class. - * <p> - - * <p>[<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"> Introduction to this package. </a>] -**/ + * + * [<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"> Introduction to this package. </a>] + **/ public interface Sync {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java Wed Jul 05 20:32:26 2017 +0200 @@ -130,13 +130,13 @@ * This method must be synchronized since one WorkerThread could * be reclaming connections inside the synchronized backingStore * block and a second WorkerThread (or a SelectorThread) could have - * already executed the if (numberOfConnections <= .... ). As a + * already executed the if (numberOfConnections {@literal <=} .... ). As a * result the second thread would also attempt to reclaim connections. * * If connection reclamation becomes a performance issue, the connection * reclamation could make its own task and consequently executed in * a separate thread. - * Currently, the accept & reclaim are done in the same thread, WorkerThread + * Currently, the accept {@literal &} reclaim are done in the same thread, WorkerThread * by default. It could be changed such that the SelectorThread would do * it for SocketChannels and WorkerThreads for Sockets by updating the * ParserTable.
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java Wed Jul 05 20:32:26 2017 +0200 @@ -59,7 +59,7 @@ /** * Used to determine if an <code>Acceptor</code> has been initialized. * - * @return <code>true</code. if the <code>Acceptor</code> has been + * @return <code>true</code> if the <code>Acceptor</code> has been * initialized. */ public boolean initialized(); @@ -74,7 +74,7 @@ /** * Set the - * {@link com.sun.corba.se.pept.transport.Inbound.ConnectionCache InboundConnectionCache} + * {@link com.sun.corba.se.pept.transport.InboundConnectionCache InboundConnectionCache} * to be used by this <code>Acceptor</code>. * * PEPt uses separate caches for each type of <code>Acceptor</code> @@ -88,7 +88,7 @@ /** * Get the - * {@link com.sun.corba.se.pept.transport.Inbound.ConnectionCache InboundConnectionCache} + * {@link com.sun.corba.se.pept.transport.InboundConnectionCache InboundConnectionCache} * used by this <code>Acceptor</code> * * PEPt uses separate caches for each type of <code>Acceptor</code>
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java Wed Jul 05 20:32:26 2017 +0200 @@ -44,7 +44,7 @@ * <ol> * <li>POA current semantics * <li>Proper handling of POA destroy. -* <ol> +* </ol> * POA current semantics requires maintaining a ThreadLocal stack of * invocation information that is always available for POACurrent operations. * Maintaining this stack is expensive on the timescale of optimized co-located
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html Wed Jul 05 20:32:26 2017 +0200 @@ -41,8 +41,8 @@ <li>An IIOPProfile isA TaggedProfile.</li> <li>An IIOPProfile is composed of an IIOPProfileTemplate and an object ID.</li> <li>An IIOPProfileTemplate has an ObjectKeyTemplate, and contains TaggedComponents.</li> -<li>A TaggedComponent has an ID, and can be written to an OuputStream.<li> -<li>A TaggedComponentFactory reads a TaggedComponent from an InputStream.<li> +<li>A TaggedComponent has an ID, and can be written to an OuputStream.</li> +<li>A TaggedComponentFactory reads a TaggedComponent from an InputStream.</li> </ul> <p> In all cases, containment is represented by having the appropriate interface (IOR and
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java Wed Jul 05 20:32:26 2017 +0200 @@ -48,7 +48,7 @@ * * property. <p> * - * Example: <p> + * Example: * <pre> * -Dcom.sun.CORBA.connection.ORBSocketFactoryClass=MySocketFactory @@ -145,7 +145,7 @@ * * property. <p> * - * Example usage:<p> + * Example usage: * * <pre> * ... \ @@ -203,7 +203,7 @@ * Once you have the port you may add information to references * created by the associated adapter by calling * - * <code>IORInfo::add_ior_component</code><p> <p> + * <code>IORInfo::add_ior_component</code><p> * * * Note: if one is using a POA and the lifespan policy of that @@ -247,7 +247,7 @@ * * <code>ORBConstants.BAD_SERVER_ID_HANDLER_CLASS_PROPERTY</code> <p> * - * Example: <p> + * Example: * * <pre> * @@ -271,7 +271,7 @@ * <code>SOCKET_FACTORY_CLASS_PROPERTY</code> and * <code>LISTEN_SOCKET_PROPERTY</code> * - * as used by other clients and servers in your distributed system. <p> + * as used by other clients and servers in your distributed system. * */ public ServerSocket createServerSocket(String type, int port) @@ -324,7 +324,7 @@ * * The <code>SocketInfo</code> given to <code>getEndPointInfo</code> * is either null or an object obtained - * from <code>GetEndPointInfoAgainException</code> <p> + * from <code>GetEndPointInfoAgainException</code> * */ public SocketInfo getEndPointInfo(org.omg.CORBA.ORB orb, @@ -333,7 +333,7 @@ /** - * DEPRECATED. DEPRECATED. DEPRECATED. DEPRECATED. <p + * DEPRECATED. DEPRECATED. DEPRECATED. DEPRECATED. <p> * * This method is used by a client side ORB. <p> * @@ -346,7 +346,7 @@ * * If this method throws GetEndPointInfoAgainException then the * ORB calls <code>getEndPointInfo</code> again, passing it the - * <code>SocketInfo</code> object contained in the exception. <p> + * <code>SocketInfo</code> object contained in the exception. * */ public Socket createSocket(SocketInfo socketInfo)
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java Wed Jul 05 20:32:26 2017 +0200 @@ -30,8 +30,7 @@ /** * This interface is implemented by our implementation of * PortableInterceptor.ClientRequestInfo and - * PortableInterceptor.ServerRequestInfo. <p> - * + * PortableInterceptor.ServerRequestInfo. */ public interface RequestInfoExt
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java Wed Jul 05 20:32:26 2017 +0200 @@ -27,13 +27,9 @@ import java.util.*; /** - * <p> + * @author Hemanth Puttaswamy * - * @author Hemanth Puttaswamy - * </p> - * <p> * A Cleaner Abstraction to provide a Monitored Attribute of type 'Long' - * </p> */ public abstract class LongMonitoredAttributeBase extends MonitoredAttributeBase { @@ -42,20 +38,14 @@ /** - * <p> * Constructs LongMonitoredAttribute, by creating the * MonitoredAttributeInfo with 'Long' as the class type. * Users are expected to extend this class and provide the implementation * for getValue() and if needed clearState() as well. - * </p> - * <p> * - * @param name of tthe MonitoredAttribute - * </p> - * <p> + * @param name of the MonitoredAttribute * @param description of the Attribute, Please provid a well thought out * description, so that the admin can make sense of the attribute supplied. - * </p> */ public LongMonitoredAttributeBase(String name, String description) { super( name );
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java Wed Jul 05 20:32:26 2017 +0200 @@ -28,15 +28,11 @@ import java.util.*; /** - * <p> + * @author Hemanth Puttaswamy * - * @author Hemanth Puttaswamy - * </p> - * <p> * Monitored Attribute is the interface to represent a Monitorable * Attribute. Using this interface, one can get the value of the attribute * and set the value if it is a writeable attribute. - * </p> */ public interface MonitoredAttribute { @@ -44,34 +40,25 @@ // operations /** - * <p> * Gets the Monitored Attribute Info for the attribute. - * </p> - * <p> * - * @param monitoredAttributeInfo for this Monitored Attribute. - * </p> + * @return monitoredAttributeInfo for this Monitored Attribute. */ public MonitoredAttributeInfo getAttributeInfo(); /** - * <p> * Sets the value for the Monitored Attribute if isWritable() is false, the * method will throw ILLEGAL Operation exception. * * Also, the type of 'value' should be same as specified in the * MonitoredAttributeInfo for a particular instance. - * </p> - * <p> * * @param value should be any one of the Basic Java Type Objects which are * Long, Double, Float, String, Integer, Short, Character, Byte. - * </p> */ public void setValue(Object value); /** - * <p> * Gets the value of the Monitored Attribute. The value can be obtained * from different parts of the module. User may choose to delegate the call * to getValue() to other variables. @@ -79,34 +66,21 @@ * NOTE: It is important to make sure that the type of Object returned in * getvalue is same as the one specified in MonitoredAttributeInfo for this * attribute. - * </p> - * <p> * - * </p> - * <p> - * - * @param value is the current value for this MonitoredAttribute - * </p> + * @return the current value for this MonitoredAttribute */ public Object getValue(); /** - * <p> * Gets the name of the Monitored Attribute. - * </p> - * <p> * - * @param name of this Attribute - * </p> + * @return name of this Attribute */ public String getName(); /** - * <p> * If this attribute needs to be cleared, the user needs to implement this * method to reset the state to initial state. If the Monitored Attribute * doesn't change like for example (ConnectionManager High Water Mark), * then clearState() is a No Op. - * </p> - * */ public void clearState();
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java Wed Jul 05 20:32:26 2017 +0200 @@ -27,16 +27,11 @@ import java.util.*; /** - * <p> + * @author Hemanth Puttaswamy * - * @author Hemanth Puttaswamy - * </p> - * <p> * A Convenient class provided to help users extend and implement only * getValue(), if there is no need to clear the state and the attribute is not * writable. - * - * </p> */ public abstract class MonitoredAttributeBase implements MonitoredAttribute { String name;
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java Wed Jul 05 20:32:26 2017 +0200 @@ -27,14 +27,10 @@ import java.util.*; /** - * <p> + * @author Hemanth Puttaswamy * - * @author Hemanth Puttaswamy - * </p> - * <p> * Monitored AttributeInfo contains the meta information of the Monitored * Attribute. - * </p> */ public interface MonitoredAttributeInfo { @@ -42,45 +38,38 @@ // operations /** - * <p> * If the Attribute is writable from ASAdmin then isWritable() will return * true. - * </p> - * <p> * * @return a boolean with true or false - * </p> */ public boolean isWritable(); /** - * <p> * isStatistic() is true if the attribute is presented as a Statistic. - * </p> - * <p> * * @return a boolean with true or false - * </p> */ public boolean isStatistic(); /** - * <p> - * Class Type: We will allow only basic class types: 1)Boolean 2)Integer - * 3)Byte 4)Long 5)Float 6)Double 7)String 8)Character - * </p> - * <p> + * Class Type: We will allow only basic class types: + * <ol> + * <li>Boolean</li> + * <li>Integer</li> + * <li>Byte</li> + * <li>Long</li> + * <li>Float</li> + * <li>Double</li> + * <li>String</li> + * <li>Character</li> + * </ol> * * @return a Class Type - * </p> */ public Class type(); /** - * <p> * Get's the description for the Monitored Attribute. - * </p> - * <p> * * @return a String with description - * </p> */ public String getDescription();
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java Wed Jul 05 20:32:26 2017 +0200 @@ -25,17 +25,12 @@ package com.sun.corba.se.spi.monitoring; /** - * <p> + * @author Hemanth Puttaswamy * - * @author Hemanth Puttaswamy - * </p> - * <p> * MonitoredAttributeInfoFactory used mostly by internal classes. If the * User needs to define some special MonitoredAttributes like a Character * type Monitored Attribute, they can use this factory to build the meta * information. - * - * </p> */ public interface MonitoredAttributeInfoFactory {
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java Wed Jul 05 20:32:26 2017 +0200 @@ -30,161 +30,101 @@ import java.util.Collection; /** - * <p> + * @author Hemanth Puttaswamy * - * @author Hemanth Puttaswamy - * </p> - * <p> * Monitored Object provides an Hierarchichal view of the ORB Monitoring * System. It can contain multiple children and a single parent. Each * Monitored Object may also contain Multiple Monitored Attributes. - * </p> */ public interface MonitoredObject { /////////////////////////////////////// // operations /** - * <p> * Gets the name of this MonitoredObject - * </p><p> * * @return a String with name of this Monitored Object - * </p> */ public String getName(); /** - * <p> * Gets the description of MonitoredObject - * </p><p> * * @return a String with Monitored Object Description. - * </p> */ public String getDescription(); /** - * <p> * This method will add a child Monitored Object to this Monitored Object. - * </p> - * <p> - * </p> */ public void addChild( MonitoredObject m ); /** - * <p> * This method will remove child Monitored Object identified by the given name - * </p> - * <p> + * * @param name of the ChildMonitored Object - * </p> */ public void removeChild( String name ); /** - * <p> * Gets the child MonitoredObject associated with this MonitoredObject * instance using name as the key. The name should be fully qualified name * like orb.connectionmanager - * </p> - * <p> * * @return a MonitoredObject identified by the given name - * </p> - * <p> * @param name of the ChildMonitored Object - * </p> */ public MonitoredObject getChild(String name); /** - * <p> * Gets all the Children registered under this instance of Monitored * Object. - * </p> - * <p> * * @return Collection of immediate Children associated with this MonitoredObject. - * </p> */ public Collection getChildren(); /** - * <p> * Sets the parent for this Monitored Object. - * </p> - * <p> - * </p> */ public void setParent( MonitoredObject m ); /** - * <p> * There will be only one parent for an instance of MontoredObject, this * call gets parent and returns null if the Monitored Object is the root. - * </p> - * <p> * * @return a MonitoredObject which is a Parent of this Monitored Object instance - * </p> */ public MonitoredObject getParent(); /** - * <p> * Adds the attribute with the given name. - * </p> - * <p> * - * </p> - * <p> * @param value is the MonitoredAttribute which will be set as one of the * attribute of this MonitoredObject. - * </p> */ public void addAttribute(MonitoredAttribute value); /** - * <p> * Removes the attribute with the given name. - * </p> - * <p> * - * </p> - * <p> * @param name is the MonitoredAttribute name - * </p> */ public void removeAttribute(String name); /** - * <p> * Gets the Monitored Object registered by the given name - * </p> * - * <p> * @return a MonitoredAttribute identified by the given name - * </p> - * <p> * @param name of the attribute - * </p> */ public MonitoredAttribute getAttribute(String name); /** - * <p> * Gets all the Monitored Attributes for this Monitored Objects. It doesn't * include the Child Monitored Object, that needs to be traversed using * getChild() or getChildren() call. - * </p> - * <p> * * @return Collection of all the Attributes for this MonitoredObject - * </p> */ public Collection getAttributes(); /** - * <p> * Clears the state of all the Monitored Attributes associated with the * Monitored Object. It will also clear the state on all it's child * Monitored Object. The call to clearState will be initiated from * CORBAMBean.startMonitoring() call. - * </p> - * */ public void clearState();
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java Wed Jul 05 20:32:26 2017 +0200 @@ -25,14 +25,9 @@ package com.sun.corba.se.spi.monitoring; /** - * <p> - * * @author Hemanth Puttaswamy - * </p> - * <p> * * MonitoredObject Factory to create Monitored Object. - * </p> */ public interface MonitoredObjectFactory { /**
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java Wed Jul 05 20:32:26 2017 +0200 @@ -29,17 +29,13 @@ import com.sun.corba.se.impl.monitoring.MonitoringManagerFactoryImpl; /** - * <p> + * @author Hemanth Puttaswamy * - * @author Hemanth Puttaswamy - * </p> - * <p> * This is used for getting the default factories for * MonitoredObject, MonitoredAttributeInfo and MonitoringManager. We do not * expect users to use the MonitoredAttributeInfo factory most of the time * because the Info is automatically built by StringMonitoredAttributeBase * and LongMonitoredAttributeBase. - * </p> */ public class MonitoringFactories { /////////////////////////////////////// @@ -57,20 +53,15 @@ // operations /** - * <p> * Gets the MonitoredObjectFactory - * </p> - * <p> * * @return a MonitoredObjectFactory - * </p> */ public static MonitoredObjectFactory getMonitoredObjectFactory( ) { return monitoredObjectFactory; } /** - * <p> * Gets the MonitoredAttributeInfoFactory. The user is not expected to use this * Factory, since the MonitoredAttributeInfo is internally created by * StringMonitoredAttributeBase, LongMonitoredAttributeBase and @@ -79,11 +70,8 @@ * build a DoubleMonitoredAttributeBase like LongMonitoredAttributeBase * and build a MonitoredAttributeInfo required by MonitoredAttributeBase * internally by using this Factory. - * </p> - * <p> * * @return a MonitoredAttributeInfoFactory - * </p> */ public static MonitoredAttributeInfoFactory getMonitoredAttributeInfoFactory( ) @@ -92,18 +80,14 @@ } /** - * <p> * Gets the MonitoredManagerFactory. The user is not expected to use this * Factory, since the ORB will be automatically initialized with the * MonitoringManager. * * User can get hold of MonitoringManager associated with ORB by calling * orb.getMonitoringManager( ) - * </p> - * <p> * * @return a MonitoredManagerFactory - * </p> */ public static MonitoringManagerFactory getMonitoringManagerFactory( ) { return monitoringManagerFactory;
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java Wed Jul 05 20:32:26 2017 +0200 @@ -30,15 +30,11 @@ import java.util.*; /** - * <p> * Monitoring Manager will have a 1 to 1 association with the ORB. This * gives access to the top level Monitored Object, using which more * Monitored Objects and Attributes can be added and traversed. - * </p> - * <p> * * @author Hemanth Puttaswamy - * </p> */ public interface MonitoringManager extends Closeable { @@ -46,23 +42,14 @@ // operations /** - * <p> * Gets the Root Monitored Object which contains a Hierarchy Of Monitored * Objects exposing various Monitorable Attributes of Various modules. - * </p> - * <p> - * - * @param MonitoredObject ... - * </p> */ public MonitoredObject getRootMonitoredObject(); /** - * <p> * Initialize is called whenever there is a start monitoring call to CORBA * MBean. This will result in triaging initialize to all the * MonitoredObjects and it's Monitored Attributes. - * </p> - * */ public void clearState();
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java Wed Jul 05 20:32:26 2017 +0200 @@ -25,14 +25,10 @@ package com.sun.corba.se.spi.monitoring; /** - * <p> + * @author Hemanth Puttaswamy * - * @author Hemanth Puttaswamy - * </p> - * <p> * MonitoringObjectFactory is used internally by the ORB, It is not for * general public use. - * </p> */ public interface MonitoringManagerFactory { /**
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java Wed Jul 05 20:32:26 2017 +0200 @@ -27,15 +27,11 @@ import java.util.*; /** - * <p> + * @author Hemanth Puttaswamy * - * @author Hemanth Puttaswamy - * </p> - * <p> * StatisticsMonitoredAttribute is provided as a convenience to collect the * Statistics of any entity. The getValue() call will be delegated to the * StatisticsAccumulator set by the user. - * </p> */ public class StatisticMonitoredAttribute extends MonitoredAttributeBase { @@ -55,32 +51,19 @@ /** - * <p> * Constructs the StaisticMonitoredAttribute, builds the required * MonitoredAttributeInfo with Long as the class type and is always * readonly attribute. - * </p> - * <p> * * @param name Of this attribute - * </p> - * <p> - * @return a StatisticMonitoredAttribute - * </p> - * <p> * @param desc should provide a good description on the kind of statistics * collected, a good example is "Connection Response Time Stats will Provide the * detailed stats based on the samples provided from every request completion * time" - * </p> - * <p> * @param s is the StatisticsAcumulator that user will use to accumulate the * samples and this Attribute Object will get the computed statistics values * from. - * </p> - * <p> * @param mutex using which clearState() and getValue() calls need to be locked. - * </p> */ public StatisticMonitoredAttribute(String name, String desc, StatisticsAccumulator s, Object mutex)
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java Wed Jul 05 20:32:26 2017 +0200 @@ -27,11 +27,8 @@ import java.util.*; /** - * <p> + * @author Hemanth Puttaswamy * - * @author Hemanth Puttaswamy - * </p> - * <p> * StatisticsAccumulator accumulates the samples provided by the user and * computes the value of minimum, maximum, sum and sample square sum. When * the StatisticMonitoredAttribute calls getValue(), it will compute all @@ -42,7 +39,6 @@ * Users can easily extend this class and provide the implementation of * toString() method to format the stats as desired. By default all the stats * are printed in a single line. - * </p> */ public class StatisticsAccumulator { @@ -72,19 +68,12 @@ /** - * <p> * User will use this method to just register a sample with the * StatisticsAccumulator. This is the only method that User will use to * expose the statistics, internally the StatisticMonitoredAttribute will * collect the information when requested from the ASAdmin. - * </p> - * <p> - * - * </p> - * <p> * * @param value a double value to make it more precise - * </p> */ public void sample(double value) { sampleCount++; @@ -137,19 +126,11 @@ } /** - * <p> * Construct the Statistics Accumulator by providing the unit as a String. - * The examples of units are "Hours", "Minutes", - * "Seconds", "MilliSeconds", "Micro Seconds" - * etc., - * </p> - * <p> + * The examples of units are "Hours", "Minutes", + * "Seconds", "MilliSeconds", "Micro Seconds" etc. * - * @return a StatisticsAccumulator with ... - * </p> - * <p> * @param unit a String representing the units for the samples collected - * </p> */ public StatisticsAccumulator( String unit ) { this.unit = unit;
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java Wed Jul 05 20:32:26 2017 +0200 @@ -27,14 +27,10 @@ import java.util.*; /** - * <p> + * @author Hemanth Puttaswamy * - * @author Hemanth Puttaswamy - * </p> - * <p> * A Convenient Abstraction to present String type Monitored Attribute. One * of the examples of StringMonitoredAttribute is the State information. - * </p> */ public abstract class StringMonitoredAttributeBase extends MonitoredAttributeBase @@ -45,20 +41,11 @@ /** - * <p> * Constructs StringMonitoredAttribute with the MonitoredAttributeInfo * built with the class type of String. - * </p> - * <p> * * @param name of this attribute - * </p> - * <p> * @param description of this attribute - * </p> - * <p> - * @return a StringMonitoredAttributeBase - * </p> */ public StringMonitoredAttributeBase(String name, String description) { super( name );
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java Wed Jul 05 20:32:26 2017 +0200 @@ -89,7 +89,7 @@ * <li>A local invocation, where the dispatch is handled in the client subcontract.</li> * <li>A cached local invocation, where the servant is cached when the IOR is established * for the client subcontract, and the dispatch is handled in the client subcontract -* to the cached subcontract.<li> +* to the cached subcontract.</li> * </ol> * <p> * Each of these 3 cases is handled a bit differently. On each request, assume as known @@ -111,11 +111,11 @@ * <li>oa.returnServant()</li> * <li>oa.exit()</li> * <li>pop info</li> -* <ol> +* </ol> * </li> -* REVISIT: Is this the required order for exit/pop? Cna they be nested instead? +* <!-- REVISIT: Is this the required order for exit/pop? Cna they be nested instead? * Note that getInvocationServant and returnServant may throw exceptions. In such cases, -* returnServant, exit, and pop must be called in the correct order. +* returnServant, exit, and pop must be called in the correct order. --> * <li>The local pattern: * <ol> * <li>oa = oaf.find( oaid )</li> @@ -128,10 +128,10 @@ * <li>oa.returnServant()</li> * <li>oa.exit()</li> * <li>pop info</li> -* <ol> +* </ol> * </li> -* This is the same as the remote case, except that setExecuteReturnServantInResponseConstructor -* is not needed (or possible, since there is no server request). +* <!-- This is the same as the remote case, except that setExecuteReturnServantInResponseConstructor +* is not needed (or possible, since there is no server request). --> * <li>The fast local pattern: When delegate is constructed, * first extract ObjectKey from IOR in delegate, * then get ObjectId, ObjectAdapterId, and ObjectAdapterFactory (oaf). Then: @@ -143,14 +143,14 @@ * <li>pop info * </ol> * The info instance (which includes the Servant) is cached in the client subcontract. -* <p>Then, on each invocation:</p> +* <p>Then, on each invocation: * <ol> * <li>newinfo = copy of info (clone)</li> * <li>info.setOperation( operation )</li> * <li>push newinfo</li> * <li>oa.enter()</li> * <li>dispatch to servant</li> -* <li>oa.returnServant()</li> // XXX This is probably wrong: remove it. +* <li>oa.returnServant()</li> <!-- XXX This is probably wrong: remove it. --> * <li>oa.exit()</li> * <li>pop info</li> * </ol>
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/DataCollector.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orb/DataCollector.java Wed Jul 05 20:32:26 2017 +0200 @@ -58,7 +58,7 @@ * mappings in the resulting properties. Also, -ORBInitialServices * is handled specially in applet mode: they are converted from * relative to absolute URLs. - * @raises IllegalStateException if setPropertyNames has not + * @throws IllegalStateException if setPropertyNames has not * been called. */ Properties getProperties() ;
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java Wed Jul 05 20:32:26 2017 +0200 @@ -46,8 +46,8 @@ * in the state machine, as the state could be corrupted. * Any exception thrown by the Action for the transition * will be propagated to doIt. - * @param FSM fsm is the state machine causing this action. - * @param Input in is the input that caused the transition. + * @param fsm the state machine causing this action. + * @param in the input that caused the transition. */ public void doIt( FSM fsm, Input in ) ; }
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Guard.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Guard.java Wed Jul 05 20:32:26 2017 +0200 @@ -93,8 +93,8 @@ * input is retried when the thread runs again. * </ul> * - * @param FSM fsm is the state machine causing this action. - * @param Input in is the input that caused the transition. + * @param fsm is the state machine causing this action. + * @param in is the input that caused the transition. */ public Result evaluate( FSM fsm, Input in ) ; }
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java Wed Jul 05 20:32:26 2017 +0200 @@ -42,9 +42,8 @@ * the service context and provides any needed methods for manipulating * the service context. Each subclass must provide the following * members: -* <p> * <ul> -* </li>a public static final int SERVICE_CONTEXT_ID that gives the OMG +* <li>a public static final int SERVICE_CONTEXT_ID that gives the OMG * (or other) defined id for the service context. This is needed for the * registration mechanism defined in ServiceContexts. OMG defined * service context ids are taken from section 13.6.7 of ptc/98-12-04.</li>
--- a/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/portable/ValueHelper.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/org/omg/CORBA/portable/ValueHelper.java Wed Jul 05 20:32:26 2017 +0200 @@ -32,7 +32,7 @@ * An interface that is implemented by valuetype helper classes. * This interface appeared in CORBA 2.3 drafts but was removed from * the published CORBA 2.3 specification. - * <P> + * * @deprecated Deprecated by CORBA 2.3. */ @Deprecated
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java Wed Jul 05 20:32:26 2017 +0200 @@ -68,9 +68,9 @@ * must check the arguments passed to it for validity and process the * arguments appropriately. If it detects an invalid argument, it should * throw an InvalidArgument exception. Arguments MUST be of the form - * `/<arg> [<qualifiers>]' or `-<arg> [<qualifiers>]' where <qualifiers> - * is optional (for example, -iC:\includes, `C:\includes' is the qualifier - * for the argument `i'). + * {@code '/<arg> [<qualifiers>]'} or {@code '-<arg> [<qualifiers>]'} where {@code <qualifiers>} + * is optional (for example, -iC:\includes, 'C:\includes' is the qualifier + * for the argument 'i'). * @param args The arguments which are unknown by the framework. * @param properties Environment-style properties collected from the * file idl.config. @@ -289,7 +289,7 @@ public Hashtable definedSymbols = new Hashtable (); /** - * <f46082.46.01> True if new module entries are created for each + * (f46082.46.01) True if new module entries are created for each * re-opened module. **/ public boolean cppModule = false;
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -80,7 +80,7 @@ } // generate /** Access the attribute generator. - @returns an object which implements the AttributeGen interface. + @return an object which implements the AttributeGen interface. @see AttributeGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Compile.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Compile.java Wed Jul 05 20:32:26 2017 +0200 @@ -52,7 +52,7 @@ * Compiler usage: * <br><br> * - * java com.sun.tools.corba.se.idl.toJava.compile [options] <idl file> + * {@code java com.sun.tools.corba.se.idl.toJava.compile [options] <idl file>} * <br><br> * * where <idl file> is the name of a file containing IDL definitions, @@ -62,17 +62,17 @@ * * Options: * <dl> - * <dt>-i <include path> + * <dt>{@code -i <include path>} * <dd>By default, the current directory is scanned for included files. * This option adds another directory. See also Note 1 below. * - * <dt>-d <symbol> - * <dd>This is equivalent to the following line in an IDL file: #define <symbol> + * <dt>{@code -d <symbol>} + * <dd>This is equivalent to the following line in an IDL file: {@code #define <symbol>} * - * <dt>-emitAll + * <dt>{@code -emitAll} * <dd>Emit all types, including those found in #included files. * - * <dt>-v + * <dt>{@code -v} * <dd>Verbose mode. * </dl> * @@ -81,9 +81,9 @@ * time. Instead, these can be placed into a config file called idl.config. * This file must be in the CLASSPATH. The format of the includes line is: * - * <pre> + * <pre>{@code * includes=<path1>;<path2>;...;<pathN> - * </pre> + * }</pre> * * Note that the path separator character, here shown as a semicolon, is * machine dependent. For instance, on Windows 95 this character is a @@ -481,10 +481,10 @@ **/ public Arguments arguments = null; /** - * This hashtable contains <real name, alias> pairs. It is filled in by + * This hashtable contains {@code <real name, alias>} pairs. It is filled in by * extenders in cases where they wish to override an IDL type name with * some other name. For instance, when mapping to Java, there could be - * an overrideNames entry of <"TRUE", "true">. NOTE: Do NOT change this + * an overrideNames entry of {@code <"TRUE", "true">}. NOTE: Do NOT change this * variable to a new Hash table. Just add elements to it. **/ protected Hashtable overrideNames = new Hashtable (); @@ -495,8 +495,8 @@ **/ protected Hashtable symbolTable = new Hashtable (); /** - * This is a vector of strings of the form "IDLfile" or <IDLfile>. It is - * a list of the files included in the given IDL file. It will be empty + * This is a vector of strings of the form {@code "IDLfile"} or {@code <IDLfile>}. + * It is a list of the files included in the given IDL file. It will be empty * until the parse method executes. If errors are encountered, the state * of this vector is undefined. **/
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -90,7 +90,7 @@ } // generate /** Access the constant generator. - @returns an object which implements the ConstGen interface. + @return an object which implements the ConstGen interface. @see ConstGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/DefaultSymtabFactory.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/DefaultSymtabFactory.java Wed Jul 05 20:32:26 2017 +0200 @@ -202,7 +202,7 @@ 'char', 'octet', 'short', 'long', etc. The reason it is not limited to these is that, as an extender, you may wish to override these names. For instance, when generating Java code, octet translates to byte, so - there is an entry in Compile.overrideNames: <"octet", "byte"> and a + there is an entry in Compile.overrideNames: {@code <"octet", "byte">} and a PrimitiveEntry in the symbol table for "byte". */ public PrimitiveEntry primitiveEntry (String name) {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -84,7 +84,7 @@ } // generate /** Access the enumerator generator. - @returns an object which implements the EnumGen interface. + @return an object which implements the EnumGen interface. @see EnumGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -80,7 +80,7 @@ } // generate /** Access the exception generator. - @returns an object which implements the ExceptionGen interface. + @return an object which implements the ExceptionGen interface. @see ExceptionGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -83,7 +83,7 @@ } // generate /** Access the interface generator. - @returns an object which implements the InterfaceGen interface. + @return an object which implements the InterfaceGen interface. @see InterfaceGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -79,7 +79,7 @@ } // generate /** Access the interface generator. - @returns an object which implements the ForwardValueGen interface. + @return an object which implements the ForwardValueGen interface. @see ValueGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -81,7 +81,7 @@ } // generate /** Access the Include type generator. - @returns an object which implements the IncludeGen interface. + @return an object which implements the IncludeGen interface. @see IncludeGen */ public Generator generator () { @@ -97,7 +97,7 @@ //d44810 /** Access the fully-qualified file specification of this include. - @returns a string containing the path of the include file. */ + @return a string containing the path of the include file. */ public String absFilename () { return _absFilename;
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -111,7 +111,7 @@ } // generate /** Access the interface generator. - @returns an object which implements the InterfaceGen interface. + @return an object which implements the InterfaceGen interface. @see InterfaceGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -89,7 +89,7 @@ } // generate /** Access the method generator. - @returns an object which implements the MethodGen interface. + @return an object which implements the MethodGen interface. @see MethodGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -84,7 +84,7 @@ } // generate /** Access the module generator. - @returns an object which implements the ModuleGen interface. + @return an object which implements the ModuleGen interface. @see ModuleGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -73,7 +73,7 @@ } // generate /** Access the constant generator. - @returns an object which implements the ConstGen interface. + @return an object which implements the ConstGen interface. @see ConstGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -88,7 +88,7 @@ } // generate /** Access the parameter generator. - @returns an object which implements the ParameterGen interface. + @return an object which implements the ParameterGen interface. @see ParameterGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -80,7 +80,7 @@ } // generate /** Access the Include type generator. - @returns an object which implements the IncludeGen interface. + @return an object which implements the IncludeGen interface. @see IncludeGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -81,7 +81,7 @@ } // generate /** Access the primitive type generator. - @returns an object which implements the PrimitiveGen interface. + @return an object which implements the PrimitiveGen interface. @see PrimitiveGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java Wed Jul 05 20:32:26 2017 +0200 @@ -68,8 +68,8 @@ /** * Determine is a supplied string meets the minimal format requirement * for a Repository ID. - * @return true iff supplied string has form '<format>:<string>', where - * <format> is any non-empty string not containing ':'. + * @return true if supplied string has form {@code '<format>:<string>'}, where + * {@code <format>} is any non-empty string not containing ':'. **/ public static boolean hasValidForm (String string) {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -101,7 +101,7 @@ } // generate /** Access the sequence generator. - @returns an object which implements the SequenceGen interface. + @return an object which implements the SequenceGen interface. @see SequenceGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -91,7 +91,7 @@ } // generate /** Access the primitive type generator. - @returns an object which implements the PrimitiveGen interface. + @return an object which implements the PrimitiveGen interface. @see PrimitiveGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -90,7 +90,7 @@ } // generate /** Access the struct generator. - @returns an object which implements the StructGen interface. + @return an object which implements the StructGen interface. @see StructGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -127,7 +127,7 @@ /** Get the name of this entry's module. If there are modules within modules, each module name is separated by '/'. - @returns this entry's module name. */ + @return this entry's module name. */ public String module () { return _module;
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java Wed Jul 05 20:32:26 2017 +0200 @@ -97,7 +97,7 @@ char, octet, short, long, etc. The reason it is not limited to these is that, as an extender, you may wish to override these names. For instance, when generating Java code, octet translates to byte, - so there is an entry in Compile.overrideNames: <"octet", "byte"> + so there is an entry in Compile.overrideNames: {@code <"octet", "byte">} and a PrimitiveEntry in the symbol table for "byte". */ PrimitiveEntry primitiveEntry (String name);
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Token.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Token.java Wed Jul 05 20:32:26 2017 +0200 @@ -332,7 +332,7 @@ * @param boolean[] collidesWithKeyword is an array containing one value: a flag * representing whether this string is an identifier that collides with a keyword. * This is set by this method. - * @returns Token The resulting Token corresponding to string. + * @return Token The resulting Token corresponding to string. */ public static Token makeKeywordToken( String string, float corbaLevel, boolean escapedOK, boolean[] collision )
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -110,7 +110,7 @@ } /** Access the typedef generator. - @returns an object which implements the TypedefGen interface. + @return an object which implements the TypedefGen interface. @see TypedefGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionBranch.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionBranch.java Wed Jul 05 20:32:26 2017 +0200 @@ -46,29 +46,21 @@ * of what it may contain: * <dl> * <dt> - * <pre> - * case 1: short x; - * </pre> - * <dd><short x, <1>, false> + * {@code case 1: short x;} + * <dd>{@code <short x, <1>, false>} * <dt> - * <pre> - * case 0: - * case 8: - * case 2: long x; - * </pre> - * <dd><long x, <0, 8, 2>, false> + * {@code case 0:}<br> + * {@code case 8:}<br> + * {@code case 2: long x;} + * <dd>{@code <long x, <0, 8, 2>, false>} * <dt> - * <pre> - * default: long x; - * </pre> - * <dd><long x, <>, true> + * {@code default: long x;} + * <dd>{@code <long x, <>, true>} * <dt> - * <pre> - * case 0: - * case 2: - * default: char c; - * </pre> - * <dd><char c, <0, 2>, true> + * {@code case 0:}<br> + * {@code case 2:}<br> + * {@code default: char c;} + * <dd>{@code <char c, <0, 2>, true>} * </dl> **/ public class UnionBranch
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -93,7 +93,7 @@ } // generate /** Access the union generator. - @returns an object which implements the UnionGen interface. + @return an object which implements the UnionGen interface. @see UnionGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -77,7 +77,7 @@ } // generate /** Access the value generator. - @returns an object which implements the ValueGen interface. + @return an object which implements the ValueGen interface. @see ValueGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java Wed Jul 05 20:32:26 2017 +0200 @@ -86,7 +86,7 @@ } // generate /** Access the value generator. - @returns an object which implements the ValueGen interface. + @return an object which implements the ValueGen interface. @see ValueGen */ public Generator generator () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java Wed Jul 05 20:32:26 2017 +0200 @@ -43,11 +43,11 @@ /** * This class contains values. Objects of this class are the terminal * nodes of an expression tree. - * <b> + * <p> * Note that there is a constructor for Double values, but not Float. * CORBA defines that all floating point expressions are evaluated as * double, and that the result is coerced back to float if necessary. - * <b> + * <p> * Note also that there is a constructor for long values, but not for * int or short. CORBA defines that all integral expressions are evaluated * as unsigned long. A CORBA long is a Java int. There is no unsigned int
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java Wed Jul 05 20:32:26 2017 +0200 @@ -260,7 +260,7 @@ } // packageFromProps /** - * d57482 <klr> method added so default emitter check could be overriden. + * d57482 (klr) method added so default emitter check could be overriden. **/ protected void setDefaultEmitter () { // If the flag -fclient was not found, assume it.
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java Wed Jul 05 20:32:26 2017 +0200 @@ -64,7 +64,7 @@ } // ctor /** - * <d62023-klr> Added for 2.4 RTF + * (d62023-klr) Added for 2.4 RTF **/ protected void abstractMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) { @@ -83,7 +83,7 @@ } // abstractMethod /** - * <d62023-klr> Added for 2.4 RTF + * (d62023-klr) Added for 2.4 RTF **/ protected void interfaceMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java Wed Jul 05 20:32:26 2017 +0200 @@ -87,37 +87,37 @@ * * Options: * <dl> - * <dt>-i <include path> + * <dt>{@code -i <include path>} * <dd>By default, the current directory is scanned for included files. * This option adds another directory. See also the note below. * - * <dt>-d <symbol> + * <dt>{@code -d <symbol>} * <dd>This is equivalent to the following line in an IDL file: - * #define <symbol> + * {@code #define <symbol>} * - * <dt>-f<side> - * <dd>Defines what bindings to emit. <side> is one of client, server, all, + * <dt>{@code -f <side>} + * <dd>Defines what bindings to emit. {@code <side>} is one of client, server, all, * serverTIE, allTIE. serverTIE and allTIE cause delegate model skeletons * to be emitted. If this flag is not used, -fclient is assumed. * allPOA has the same effect as all, except for generation POA type skeletons. * - * <dt>-keep + * <dt>{@code -keep} * <dd>If a file to be generated already exists, do not overwrite it. By * default it is overwritten. * - * <dt>-sep <string> + * <dt>{@code -sep <string>} * <dd>Only valid with -m. Replace the file separator character with - * <string> in the file names listed in the .u file. + * {@code <string>} in the file names listed in the .u file. * - * <dt>-emitAll + * <dt>{@code -emitAll} * <dd>Emit all types, including those found in #included files. * - * <dt>-v + * <dt>{@code -v} * <dd>Verbose mode. * - * <dt>-pkgPrefix <type> <package> - * <dd>Whereever <type> is encountered, make sure it resides within - * <package> in all generated files. <type> is a fully + * <dt>{@code -pkgPrefix <type> <package>} + * <dd>Whereever {@code <type>} is encountered, make sure it resides within + * {@code <package>} in all generated files. {@code <type>} is a fully * qualified, java-style name. * </dl> * @@ -127,9 +127,9 @@ * called idl.config. This file must be in the CLASSPATH. The format of * the includes line is: * - * <pre> + * <pre>{@code * includes=<path1>;<path2>;...;<pathN> - * </pre> + * }</pre> * * Note that the path separator character, here shown as a semicolon, * is machine dependent. For instance, on Windows 95 this character
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java Wed Jul 05 20:32:26 2017 +0200 @@ -70,7 +70,7 @@ /** * Generate the heading, including package, imports, class statements, * and open curly. - * <d62023> - don't implement ValueHelper, make non-boxed helpers abstract + * d62023 - don't implement ValueHelper, make non-boxed helpers abstract **/ protected void writeHeading () { @@ -92,8 +92,10 @@ /** * Generate the instance variables. - * <d62023> - no helper instance except for boxed valuetypes. - * - move truncatable_ids to mapped class. + * <pre> + * d62023 - no helper instance except for boxed valuetypes; + * - move truncatable_ids to mapped class. + * </pre> **/ protected void writeInstVars () { @@ -110,9 +112,9 @@ } // writeInstVars /** - * <d62023> generate members of BoxedValueHelper interface if boxed + * d62023 - generate members of BoxedValueHelper interface if boxed * - * <d62023> Hook in here to write factory methods for non-boxed ValueTypes + * d62023 - hook in here to write factory methods for non-boxed ValueTypes * into Helper. **/ protected void writeValueHelperInterface () @@ -143,8 +145,8 @@ } // writeHelperFactories /** - * <d62023> Generate constructors only for boxed valuetype helpers - * All other helpers are abstract. + * d62023 - generate constructors only for boxed valuetype helpers. + * All other helpers are abstract. **/ protected void writeCtors () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java Wed Jul 05 20:32:26 2017 +0200 @@ -190,17 +190,19 @@ /** * Generate the interface. Provides general algorithm for binding generation: - * 1.) Initialize members unique to this generator. - init () - * 2.) Open print stream - openStream () - * 3.) Write class heading (package, prologue, class statement, open curly - writeHeading () - * 4.) Write class body (member data and methods) - write*Body () - * 5.) Write class closing (close curly) - writeClosing () - * 6.) Close the print stream - closeStream () + * <ol> + * <li> Initialize members unique to this generator - init()</li> + * <li> Open print stream - openStream()</li> + * <li> Write class heading (package, prologue, class statement, open curly - writeHeading()</li> + * <li> Write class body (member data and methods) - write*Body()</li> + * <li> Write class closing (close curly) - writeClosing()</li> + * <li> Close the print stream - closeStream ()</li> + * </ol> * * For CORBA 2.3, interfaces are mapped to Operations and Signature * interfaces. The Operations interface contains the method definitions. * The Signature interface extends the Operations interface and adds - * CORBA::Object. <klr> + * CORBA::Object. (klr) **/ protected void generateInterface () {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java Wed Jul 05 20:32:26 2017 +0200 @@ -96,7 +96,7 @@ } /** - * <d62023> Write the methodEntry for a valuetype factory method into + * d62023 - write the methodEntry for a valuetype factory method into * the Value Helper class. Contents from email from Simon, * 4/25/99. **/ @@ -135,7 +135,7 @@ } // helperFactoryMethod /** - * <d62023> - write an abstract method definition + * d62023 - write an abstract method definition **/ protected void abstractMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) { @@ -152,8 +152,8 @@ } // abstractMethod /** - * <d62023> - write a default factory method implementation for the - * <value>DefaultFactory. m is a methodEntry for a factory + * d62023 - write a default factory method implementation for the + * {@code <value>DefaultFactory}. m is a methodEntry for a factory * method contained in a non-abstract ValueEntry. **/ protected void defaultFactoryMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) @@ -176,7 +176,7 @@ } // defaultFactoryMethod /** - * <d62023> - remove all valueInitializer junk + * d62023 - remove all valueInitializer junk **/ protected void writeMethodSignature () { @@ -242,7 +242,7 @@ } // writeMethodSignature /** - * <d62023> - delete method templates for valuetypes + * d62023 - delete method templates for valuetypes **/ protected void interfaceMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java Wed Jul 05 20:32:26 2017 +0200 @@ -74,7 +74,7 @@ } // ctor /** - * <d62023> - write an abstract method definition + * d62023 - write an abstract method definition **/ protected void abstractMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) { @@ -91,7 +91,7 @@ } // abstractMethod /** - * <d62023> - delete method templates for valuetypes + * d62023 - delete method templates for valuetypes **/ protected void interfaceMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java Wed Jul 05 20:32:26 2017 +0200 @@ -534,7 +534,7 @@ } // holderName /** - * <d61056> + * d61056 **/ public static String helperName (SymtabEntry entry, boolean qualifiedName) { @@ -1412,7 +1412,7 @@ // <d62023> /** * @return true if the current setting of corbaLevel is within delta of - * the range min <= corbaLevel <= max + * the range {@code min <= corbaLevel <= max} **/ public static boolean corbaLevel (float min, float max) {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java Wed Jul 05 20:32:26 2017 +0200 @@ -69,7 +69,7 @@ } // ctor /** - * <d62023> - Move from helper to mapped class + * d62023 - Move from helper to mapped class **/ protected void writeTruncatable () // <d60929> { @@ -84,7 +84,7 @@ /** - * <d62023> + * d62023 **/ public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) { @@ -121,7 +121,7 @@ } // helperRead /** - * <d62023> + * d62023 **/ public void helperWrite (SymtabEntry entry, PrintWriter stream) { @@ -144,7 +144,7 @@ } // helperWrite /** - * <d62023> + * d62023 **/ public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) {
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java Wed Jul 05 20:32:26 2017 +0200 @@ -73,15 +73,17 @@ } // ctor /** - * <d62023> - delete constructor; helper is abstract + * d62023 - delete constructor; helper is abstract **/ protected void writeConstructor () { } // writeConstructor /** - * <d62023> - delete write_value from non-boxed helpers - * - delete _write from non-boxed helpers + * <pre> + * d62023 - delete write_value from non-boxed helpers + * - delete _write from non-boxed helpers + * </pre> **/ public void helperWrite (SymtabEntry entry, PrintWriter stream) { @@ -91,7 +93,7 @@ } // helperWrite /** - * <d62023> + * d62023 **/ public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) { @@ -101,7 +103,7 @@ } // helperRead /** - * <d62023> - suppress initializers from mapped value; now generated in + * d62023 - suppress initializers from mapped value; now generated in * the Helper class and Factory class **/ protected void writeInitializers () @@ -110,7 +112,7 @@ } // writeInitializers /** - * <d62023> - Goes in mapped class, not Helper + * d62023 - goes in mapped class, not Helper **/ protected void writeTruncatable () // <d60929> { @@ -155,7 +157,7 @@ } /** - * <d62023> CustomMarshal -> CustomValue for custom valuetypes + * d62023 - CustomMarshal {@literal ->} CustomValue for custom valuetypes * mapped class is abstract **/ protected void writeHeading () @@ -217,7 +219,7 @@ } // writeHeading /** - * <d62023> - private state maps to protected, not default + * d62023 - private state maps to protected, not default **/ protected void writeMembers () { @@ -245,8 +247,7 @@ } // writeMembers /** - * <d62023> Methods need to be abstract - * writeStreamable + * d62023 - methods need to be abstract writeStreamable **/ protected void writeMethods () { @@ -294,7 +295,7 @@ } // writeMethods /** - * <d62023> Call super._read() + * d62023 - call super._read() **/ public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { @@ -335,7 +336,7 @@ } // read /** - * <d62023> Call super._write() + * d62023 - call super._write() **/ public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { @@ -374,7 +375,7 @@ } // write /** - * <62023> - generate factory interface and default factory + * d62023 - generate factory interface and default factory **/ public void generate (Hashtable symbolTable, ValueEntry v, PrintWriter str) {
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/java.corba/share/classes/org/omg/CORBA/LocalObject.java Wed Jul 05 20:32:26 2017 +0200 @@ -28,7 +28,7 @@ /** - * <P>Used as a base class for implementation of a local IDL interface in the + * Used as a base class for implementation of a local IDL interface in the * Java language mapping. It is a class which implements all the operations * in the <tt>org.omg.CORBA.Object</tt> interface. * <P>Local interfaces are implemented by using CORBA::LocalObject @@ -49,9 +49,10 @@ * <P><code>LocalObject</code> is to be used as the base class of locally * constrained objects, such as those in the PortableServer module. * The specification here is based on the CORBA Components - * Volume I - orbos/99-07-01<P> + * Volume I - orbos/99-07-01 + * * @see <a href="package-summary.html#unimpl"><code>CORBA</code> package - * comments for unimplemented features</a> + * comments for unimplemented features</a> */ public class LocalObject implements org.omg.CORBA.Object @@ -64,7 +65,7 @@ public LocalObject() {} /** - * <P>Determines whether the two object references are equivalent, + * Determines whether the two object references are equivalent, * so far as the ORB can easily determine. Two object references are equivalent * if they are identical. Two distinct object references which in fact refer to * the same object are also equivalent. However, ORBs are not required
--- a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java Wed Jul 05 20:32:26 2017 +0200 @@ -145,15 +145,15 @@ /** * Return true if this type implements - * isIDLEntity() && isException(). + * {@code isIDLEntity() && isException()}. */ public boolean isIDLEntityException () { return isIDLEntity() && isException(); } /** - * Return true if isIDLEntity() && !isValueBase() + * Return true if {@code isIDLEntity() && !isValueBase() * && !isAbstractBase() && !isCORBAObject() - * && !isIDLEntityException(). + * && !isIDLEntityException()}. */ public boolean isBoxed () { return (isIDLEntity() && !isValueBase() && @@ -1984,7 +1984,7 @@ } /** - * Return true if this is NOT a constructor && is not + * Return true if this is NOT a constructor {@code &&} is not * an attribute. */ public boolean isNormalMethod () {
--- a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java Wed Jul 05 20:32:26 2017 +0200 @@ -95,7 +95,7 @@ } /** - * Return true if env.nerrors > 0. + * Return true if {@code env.nerrors > 0}. */ public boolean anyErrors () { return env.nerrors > 0;
--- a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java Wed Jul 05 20:32:26 2017 +0200 @@ -91,8 +91,8 @@ /** * Create and return a top-level type. - * @param env The compiler environment. * @param cdef The top-level class definition. + * @param stack The context stack. * @return An RemoteType or null if is non-conforming. */ protected sun.rmi.rmic.iiop.CompoundType getTopType(ClassDefinition cdef, @@ -169,7 +169,7 @@ * Examine and consume command line arguments. * @param argv The command line arguments. Ignore null * and unknown arguments. Set each consumed argument to null. - * @param error Report any errors using the main.error() methods. + * @param main Report any errors using the main.error() methods. * @return true if no errors, false otherwise. */ public boolean parseArgs(String argv[], Main main) { @@ -195,11 +195,11 @@ else if ( argv[i].equalsIgnoreCase( "-init" ) ) { factory = false; argv[i] = null; - } + } else if ( argv[i].equalsIgnoreCase( "-factory" ) ) { factory = true; argv[i] = null; - } + } else if ( argv[i].equalsIgnoreCase( "-idlfile" ) ) { argv[i] = null; if ( ++i < argv.length && argv[i] != null && !argv[i].startsWith("-") ) { @@ -210,7 +210,7 @@ argv[i] = null; ifHash.put( idlFrom,idlTo ); continue nextArg; - } + } } main.error("rmic.option.requires.argument", "-idlfile"); result = false; @@ -403,7 +403,7 @@ * Write the output for the given OutputFileName into the output stream. * (The IDL mapping for java.lang.Class is generated from * javax.rmi.CORBA.ClassDesc in the tools workspace) - * @param OutputType ot One of the items returned by getOutputTypesFor(...) + * @param ot One of the items returned by getOutputTypesFor(...) * @param alreadyChecked A set of Types which have already been checked. * Intended to be passed to Type.collectMatching(filter,alreadyChecked). * @param p The output stream. @@ -927,7 +927,7 @@ * Add reference for given type avoiding duplication. * Sort into specials, arrays and regular references. * Filter out types which are not required. - * @param t Given Type + * @param ref Given Type * @param refHash Hashtable for type references * @param spcHash Hashtable for special type references * @param arrHash Hashtable for array references @@ -986,7 +986,7 @@ * Collect and filter thrown exceptions for a given pre-filtered method. * Keep only 'checked' exception classes minus java.rmi.RemoteException * and its subclasses - * @param method The current method + * @param mth The current method * @param excHash Hashtable containing non-duplicate thrown exceptions */ protected void getExceptions( @@ -1077,7 +1077,7 @@ * order. * Non-static, non-transient fields are mapped. * If the type is a custom valuetype, only public fields are mapped. - * @param ct The current CompoundType + * @param t The current CompoundType * @return Vector containing the data fields */ protected Vector getData( @@ -1163,7 +1163,7 @@ /** * Write forward reference for boxed valuetype for single dimension of IDL * sequence. - * If the dimension is <1 and the element is a CompoundType, write a + * If the dimension is {@literal < 1} and the element is a CompoundType, write a * forward declare for the element * @param at ArrayType for forward declare * @param dim The dimension to write @@ -1276,7 +1276,7 @@ /** * Write #includes - * @param incHash Hashtable loaded with Types to include + * @param inhHash Hashtable loaded with Types to include * @param p The output stream. */ protected void writeInheritedIncludes(
--- a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Type.java Thu May 07 20:49:48 2015 -0700 +++ b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Type.java Wed Jul 05 20:32:26 2017 +0200 @@ -51,7 +51,7 @@ * conformance checking and name mapping as defined in the "Java to IDL * Mapping" OMG specification. The family is composed of the following * fixed set of types: - * <pre> + * <pre>{@literal * * +- RemoteType <-- AbstractType * | @@ -67,7 +67,7 @@ * | * +- NCClassType * - * </pre> + * }</pre> * PrimitiveType represents a primitive or a void type. * <p> * CompoundType is an abstract base representing any non-special class
--- a/hotspot/.hgtags Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/.hgtags Wed Jul 05 20:32:26 2017 +0200 @@ -465,3 +465,4 @@ 9c916db4bf3bc164a47b5a9cefe5ffd71e111f6a jdk9-b60 715d2da5801c410746e92f08066d53bde1496286 jdk9-b61 1eab877142cce6ca06e556e2ad0af688f993f00b jdk9-b62 +2ac9b6b36689b50d1562627067c92d51781b5684 jdk9-b63
--- a/hotspot/agent/src/os/bsd/libproc_impl.c Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/os/bsd/libproc_impl.c Wed Jul 05 20:32:26 2017 +0200 @@ -215,7 +215,12 @@ return NULL; } - strncpy(newlib->name, libname, sizeof(newlib->name)); + if (strlen(libname) >= sizeof(newlib->name)) { + print_debug("libname %s too long\n", libname); + return NULL; + } + strcpy(newlib->name, libname); + newlib->base = base; if (fd == -1) {
--- a/hotspot/agent/src/os/linux/libproc_impl.c Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/os/linux/libproc_impl.c Wed Jul 05 20:32:26 2017 +0200 @@ -159,7 +159,12 @@ return NULL; } - strncpy(newlib->name, libname, sizeof(newlib->name)); + if (strlen(libname) >= sizeof(newlib->name)) { + print_debug("libname %s too long\n", libname); + return NULL; + } + strcpy(newlib->name, libname); + newlib->base = base; if (fd == -1) {
--- a/hotspot/agent/src/share/classes/com/sun/java/swing/action/ActionManager.java Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/action/ActionManager.java Wed Jul 05 20:32:26 2017 +0200 @@ -46,6 +46,11 @@ return manager; } + protected static void setInstance(ActionManager m) + { + manager = m; + } + protected abstract void addActions(); protected void addAction(String cmdname, Action action) @@ -90,6 +95,6 @@ private HashMap actions; private static ActionUtilities utilities = new ActionUtilities(); - protected static ActionManager manager; + private static ActionManager manager; }
--- a/hotspot/agent/src/share/classes/com/sun/java/swing/ui/CommonToolBar.java Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/ui/CommonToolBar.java Wed Jul 05 20:32:26 2017 +0200 @@ -46,7 +46,7 @@ { this.manager = manager; statusBar = status; - buttonSize = new Dimension(CommonUI.buttconPrefSize); + buttonSize = new Dimension(CommonUI.getButtconPrefSize()); buttonInsets = new Insets(0, 0, 0, 0); addComponents(); }
--- a/hotspot/agent/src/share/classes/com/sun/java/swing/ui/CommonUI.java Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/share/classes/com/sun/java/swing/ui/CommonUI.java Wed Jul 05 20:32:26 2017 +0200 @@ -373,20 +373,25 @@ comp.setCursor(Cursor.getPredefinedCursor(0)); } - public static final int BUTTON_WIDTH = 100; - public static final int BUTTON_HEIGHT = 26; - public static final int BUTTCON_WIDTH = 28; - public static final int BUTTCON_HEIGHT = 28; - public static final int SM_BUTTON_WIDTH = 72; - public static final int SM_BUTTON_HEIGHT = 26; - public static final int LABEL_WIDTH = 100; - public static final int LABEL_HEIGHT = 20; - public static final int TEXT_WIDTH = 150; - public static final int TEXT_HEIGHT = 20; - public static Dimension buttonPrefSize = new Dimension(100, 26); - public static Dimension buttconPrefSize = new Dimension(28, 28); - public static Dimension smbuttonPrefSize = new Dimension(72, 26); - public static Dimension labelPrefSize = new Dimension(100, 20); - public static Dimension textPrefSize = new Dimension(150, 20); + public static Dimension getButtconPrefSize() + { + return buttconPrefSize; + } + + private static final int BUTTON_WIDTH = 100; + private static final int BUTTON_HEIGHT = 26; + private static final int BUTTCON_WIDTH = 28; + private static final int BUTTCON_HEIGHT = 28; + private static final int SM_BUTTON_WIDTH = 72; + private static final int SM_BUTTON_HEIGHT = 26; + private static final int LABEL_WIDTH = 100; + private static final int LABEL_HEIGHT = 20; + private static final int TEXT_WIDTH = 150; + private static final int TEXT_HEIGHT = 20; + private static final Dimension buttonPrefSize = new Dimension(100, 26); + private static final Dimension buttconPrefSize = new Dimension(28, 28); + private static final Dimension smbuttonPrefSize = new Dimension(72, 26); + private static final Dimension labelPrefSize = new Dimension(100, 20); + private static final Dimension textPrefSize = new Dimension(150, 20); }
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodData.java Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodData.java Wed Jul 05 20:32:26 2017 +0200 @@ -148,7 +148,7 @@ ParametersTypeData<ciKlass,ciMethod> parametersTypeData() { Address base = getAddress().addOffsetTo(origField.getOffset()); int di = (int)parametersTypeDataDi.getValue(base); - if (di == -1) { + if (di == -1 || di == -2) { return null; } DataLayout dataLayout = new DataLayout(dataField.getValue(getAddress()), di);
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java Wed Jul 05 20:32:26 2017 +0200 @@ -29,9 +29,9 @@ import java.util.Observer; import sun.jvm.hotspot.debugger.Address; +import sun.jvm.hotspot.gc_interface.CollectedHeap; import sun.jvm.hotspot.gc_interface.CollectedHeapName; import sun.jvm.hotspot.memory.MemRegion; -import sun.jvm.hotspot.memory.SharedHeap; import sun.jvm.hotspot.memory.SpaceClosure; import sun.jvm.hotspot.runtime.VM; import sun.jvm.hotspot.runtime.VMObjectFactory; @@ -41,7 +41,7 @@ // Mirror class for G1CollectedHeap. -public class G1CollectedHeap extends SharedHeap { +public class G1CollectedHeap extends CollectedHeap { // HeapRegionManager _hrm; static private long hrmFieldOffset; // MemRegion _g1_reserved;
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeap.java Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeap.java Wed Jul 05 20:32:26 2017 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,7 @@ import sun.jvm.hotspot.runtime.*; import sun.jvm.hotspot.types.*; -public class CollectedHeap extends VMObject { +public abstract class CollectedHeap extends VMObject { private static long reservedFieldOffset; static { @@ -73,9 +73,7 @@ return reservedRegion().contains(a); } - public CollectedHeapName kind() { - return CollectedHeapName.ABSTRACT; - } + public abstract CollectedHeapName kind(); public void print() { printOn(System.out); } public void printOn(PrintStream tty) {
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java Wed Jul 05 20:32:26 2017 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,8 +31,6 @@ private CollectedHeapName(String name) { this.name = name; } - public static final CollectedHeapName ABSTRACT = new CollectedHeapName("abstract"); - public static final CollectedHeapName SHARED_HEAP = new CollectedHeapName("SharedHeap"); public static final CollectedHeapName GEN_COLLECTED_HEAP = new CollectedHeapName("GenCollectedHeap"); public static final CollectedHeapName G1_COLLECTED_HEAP = new CollectedHeapName("G1CollectedHeap"); public static final CollectedHeapName PARALLEL_SCAVENGE_HEAP = new CollectedHeapName("ParallelScavengeHeap");
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java Wed Jul 05 20:32:26 2017 +0200 @@ -33,8 +33,7 @@ import sun.jvm.hotspot.types.*; import sun.jvm.hotspot.utilities.*; -public class GenCollectedHeap extends SharedHeap { - private static CIntegerField nGensField; +public class GenCollectedHeap extends CollectedHeap { private static AddressField youngGenField; private static AddressField oldGenField; @@ -54,7 +53,6 @@ private static synchronized void initialize(TypeDataBase db) { Type type = db.lookupType("GenCollectedHeap"); - nGensField = type.getCIntegerField("_n_gens"); youngGenField = type.getAddressField("_young_gen"); oldGenField = type.getAddressField("_old_gen"); @@ -70,7 +68,7 @@ } public int nGens() { - return (int) nGensField.getValue(addr); + return 2; // Young + Old } public Generation getGen(int i) {
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SharedHeap.java Thu May 07 20:49:48 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package sun.jvm.hotspot.memory; - -import java.io.*; -import java.util.*; - -import sun.jvm.hotspot.debugger.*; -import sun.jvm.hotspot.gc_interface.*; -import sun.jvm.hotspot.runtime.*; -import sun.jvm.hotspot.types.*; - -public abstract class SharedHeap extends CollectedHeap { - private static VirtualConstructor ctor; - - static { - VM.registerVMInitializedObserver(new Observer() { - public void update(Observable o, Object data) { - initialize(VM.getVM().getTypeDataBase()); - } - }); - } - - private static synchronized void initialize(TypeDataBase db) { - Type type = db.lookupType("SharedHeap"); - ctor = new VirtualConstructor(db); - } - - public SharedHeap(Address addr) { - super(addr); - } - - public CollectedHeapName kind() { - return CollectedHeapName.SHARED_HEAP; - } - }
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java Wed Jul 05 20:32:26 2017 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -112,11 +112,7 @@ return ""; } public CollectedHeap heap() { - try { - return (CollectedHeap) heapConstructor.instantiateWrapperFor(collectedHeapField.getValue()); - } catch (WrongTypeException e) { - return new CollectedHeap(collectedHeapField.getValue()); - } + return (CollectedHeap) heapConstructor.instantiateWrapperFor(collectedHeapField.getValue()); } public static long getNarrowOopBase() {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/VirtualSpace.java Wed Jul 05 20:32:26 2017 +0200 @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +package sun.jvm.hotspot.memory; + +import java.util.*; +import sun.jvm.hotspot.debugger.*; +import sun.jvm.hotspot.runtime.*; +import sun.jvm.hotspot.types.*; + +public class VirtualSpace extends VMObject { + private static AddressField lowField; + private static AddressField highField; + private static AddressField lowBoundaryField; + private static AddressField highBoundaryField; + + static { + VM.registerVMInitializedObserver(new Observer() { + public void update(Observable o, Object data) { + initialize(VM.getVM().getTypeDataBase()); + } + }); + } + + private static synchronized void initialize(TypeDataBase db) { + Type type = db.lookupType("VirtualSpace"); + + lowField = type.getAddressField("_low"); + highField = type.getAddressField("_high"); + lowBoundaryField = type.getAddressField("_low_boundary"); + highBoundaryField = type.getAddressField("_high_boundary"); + } + + public VirtualSpace(Address addr) { + super(addr); + } + + public Address low() { return lowField.getValue(addr); } + public Address high() { return highField.getValue(addr); } + public Address lowBoundary() { return lowBoundaryField.getValue(addr); } + public Address highBoundary() { return highBoundaryField.getValue(addr); } + + /** Testers (all sizes are byte sizes) */ + public long committedSize() { return high().minus(low()); } + public long reservedSize() { return highBoundary().minus(lowBoundary()); } + public long uncommittedSize() { return reservedSize() - committedSize(); } + public boolean contains(Address addr) { return (low().lessThanOrEqual(addr) && addr.lessThan(high())); } +}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java Wed Jul 05 20:32:26 2017 +0200 @@ -328,7 +328,7 @@ } public Symbol getUnresolvedStringAt(int which) { - return getSymbolAt(which); + return getSlotAt(which).getSymbol(); } // returns null, if not resolved.
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java Wed Jul 05 20:32:26 2017 +0200 @@ -42,10 +42,10 @@ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException { Type type = db.lookupType("PhaseCFG"); - numBlocksField = new CIntField(type.getCIntegerField("_num_blocks"), 0); + numBlocksField = new CIntField(type.getCIntegerField("_number_of_blocks"), 0); blocksField = type.getAddressField("_blocks"); bbsField = type.getAddressField("_node_to_block_mapping"); - brootField = type.getAddressField("_broot"); + brootField = type.getAddressField("_root_block"); } private static CIntField numBlocksField;
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java Wed Jul 05 20:32:26 2017 +0200 @@ -259,8 +259,7 @@ saProps = new Properties(); URL url = null; try { - url = VM.class.getClassLoader().getResource("sa.properties"); - saProps.load(new BufferedInputStream(url.openStream())); + saProps.load(VM.class.getResourceAsStream("/sa.properties")); } catch (Exception e) { System.err.println("Unable to load properties " + (url == null ? "null" : url.toString()) +
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualSpace.java Thu May 07 20:49:48 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -package sun.jvm.hotspot.runtime; - -import java.util.*; -import sun.jvm.hotspot.debugger.*; -import sun.jvm.hotspot.types.*; - -public class VirtualSpace extends VMObject { - private static AddressField lowField; - private static AddressField highField; - private static AddressField lowBoundaryField; - private static AddressField highBoundaryField; - - static { - VM.registerVMInitializedObserver(new Observer() { - public void update(Observable o, Object data) { - initialize(VM.getVM().getTypeDataBase()); - } - }); - } - - private static synchronized void initialize(TypeDataBase db) { - Type type = db.lookupType("VirtualSpace"); - - lowField = type.getAddressField("_low"); - highField = type.getAddressField("_high"); - lowBoundaryField = type.getAddressField("_low_boundary"); - highBoundaryField = type.getAddressField("_high_boundary"); - } - - public VirtualSpace(Address addr) { - super(addr); - } - - public Address low() { return lowField.getValue(addr); } - public Address high() { return highField.getValue(addr); } - public Address lowBoundary() { return lowBoundaryField.getValue(addr); } - public Address highBoundary() { return highBoundaryField.getValue(addr); } - - /** Testers (all sizes are byte sizes) */ - public long committedSize() { return high().minus(low()); } - public long reservedSize() { return highBoundary().minus(lowBoundary()); } - public long uncommittedSize() { return reservedSize() - committedSize(); } - public boolean contains(Address addr) { return (low().lessThanOrEqual(addr) && addr.lessThan(high())); } -}
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java Thu May 07 20:49:48 2015 -0700 +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java Wed Jul 05 20:32:26 2017 +0200 @@ -314,26 +314,17 @@ //------------------------------------------------------------------------------ // frame::adjust_unextended_sp private void adjustUnextendedSP() { - // If we are returning to a compiled MethodHandle call site, the - // saved_fp will in fact be a saved value of the unextended SP. The - // simplest way to tell whether we are returning to such a call site - // is as follows: + // On x86, sites calling method handle intrinsics and lambda forms are treated + // as any other call site. Therefore, no special action is needed when we are + // returning to any of these call sites. CodeBlob cb = cb(); NMethod senderNm = (cb == null) ? null : cb.asNMethodOrNull(); if (senderNm != null) { - // If the sender PC is a deoptimization point, get the original - // PC. For MethodHandle call site the unextended_sp is stored in - // saved_fp. - if (senderNm.isDeoptMhEntry(getPC())) { - // DEBUG_ONLY(verifyDeoptMhOriginalPc(senderNm, getFP())); - raw_unextendedSP = getFP();