src/hotspot/share/runtime/arguments.cpp

rev 56298 : 8231171: remove remaining sun.java.launcher.pid references

*** 80,90 ****
  Arguments::Mode Arguments::_mode                = _mixed;
  bool   Arguments::_java_compiler                = false;
  bool   Arguments::_xdebug_mode                  = false;
  const char*  Arguments::_java_vendor_url_bug    = DEFAULT_VENDOR_URL_BUG;
  const char*  Arguments::_sun_java_launcher      = DEFAULT_JAVA_LAUNCHER;
- int    Arguments::_sun_java_launcher_pid        = -1;
  bool   Arguments::_sun_java_launcher_is_altjvm  = false;
  
  // These parameters are reset in method parse_vm_init_args()
  bool   Arguments::_AlwaysCompileLoopMethods     = AlwaysCompileLoopMethods;
  bool   Arguments::_UseOnStackReplacement        = UseOnStackReplacement;
--- 80,89 ----
*** 359,370 ****
    return false;
  }
  
  // Process java launcher properties.
  void Arguments::process_sun_java_launcher_properties(JavaVMInitArgs* args) {
!   // See if sun.java.launcher, sun.java.launcher.is_altjvm or
!   // sun.java.launcher.pid is defined.
    // Must do this before setting up other system properties,
    // as some of them may depend on launcher type.
    for (int index = 0; index < args->nOptions; index++) {
      const JavaVMOption* option = args->options + index;
      const char* tail;
--- 358,368 ----
    return false;
  }
  
  // Process java launcher properties.
  void Arguments::process_sun_java_launcher_properties(JavaVMInitArgs* args) {
!   // See if sun.java.launcher or sun.java.launcher.is_altjvm is defined.
    // Must do this before setting up other system properties,
    // as some of them may depend on launcher type.
    for (int index = 0; index < args->nOptions; index++) {
      const JavaVMOption* option = args->options + index;
      const char* tail;
*** 377,390 ****
        if (strcmp(tail, "true") == 0) {
          _sun_java_launcher_is_altjvm = true;
        }
        continue;
      }
-     if (match_option(option, "-Dsun.java.launcher.pid=", &tail)) {
-       _sun_java_launcher_pid = atoi(tail);
-       continue;
-     }
    }
  }
  
  // Initialize system properties key and value.
  void Arguments::init_system_properties() {
--- 375,384 ----
*** 1409,1422 ****
    }
  
    if (strcmp(key, "java.compiler") == 0) {
      process_java_compiler_argument(value);
      // Record value in Arguments, but let it get passed to Java.
!   } else if (strcmp(key, "sun.java.launcher.is_altjvm") == 0 ||
!              strcmp(key, "sun.java.launcher.pid") == 0) {
!     // sun.java.launcher.is_altjvm and sun.java.launcher.pid property are
!     // private and are processed in process_sun_java_launcher_properties();
      // the sun.java.launcher property is passed on to the java application
    } else if (strcmp(key, "sun.boot.library.path") == 0) {
      // append is true, writable is true, internal is false
      PropertyList_unique_add(&_system_properties, key, value, AppendProperty,
                              WriteableProperty, ExternalProperty);
--- 1403,1415 ----
    }
  
    if (strcmp(key, "java.compiler") == 0) {
      process_java_compiler_argument(value);
      // Record value in Arguments, but let it get passed to Java.
!   } else if (strcmp(key, "sun.java.launcher.is_altjvm") == 0) {
!     // sun.java.launcher.is_altjvm property is
!     // private and is processed in process_sun_java_launcher_properties();
      // the sun.java.launcher property is passed on to the java application
    } else if (strcmp(key, "sun.boot.library.path") == 0) {
      // append is true, writable is true, internal is false
      PropertyList_unique_add(&_system_properties, key, value, AppendProperty,
                              WriteableProperty, ExternalProperty);