src/share/bin/java.c

*** 1231,1241 ****
      }
      NULL_CHECK0(mid = (*env)->GetStaticMethodID(env, cls,
                  "checkAndLoadMain",
                  "(ZILjava/lang/String;)Ljava/lang/Class;"));
  
!     str = NewPlatformString(env, name);
      result = (*env)->CallStaticObjectMethod(env, cls, mid, USE_STDERR, mode, str);
  
      if (JLI_IsTraceLauncher()) {
          end   = CounterGet();
          printf("%ld micro seconds to load main class\n",
--- 1231,1241 ----
      }
      NULL_CHECK0(mid = (*env)->GetStaticMethodID(env, cls,
                  "checkAndLoadMain",
                  "(ZILjava/lang/String;)Ljava/lang/Class;"));
  
!     NULL_CHECK0(str = NewPlatformString(env, name));
      result = (*env)->CallStaticObjectMethod(env, cls, mid, USE_STDERR, mode, str);
  
      if (JLI_IsTraceLauncher()) {
          end   = CounterGet();
          printf("%ld micro seconds to load main class\n",
*** 1519,1552 ****
                                          "appendVmErgoMessage", "(ZLjava/lang/String;)V"));
  
      NULL_CHECK(printHelp = (*env)->GetStaticMethodID(env, cls,
                                          "printHelpMessage", "(Z)V"));
  
!     jprogname = (*env)->NewStringUTF(env, _program_name);
  
      /* Initialize the usage message with the usual preamble */
      (*env)->CallStaticVoidMethod(env, cls, initHelp, jprogname);
  
  
      /* Assemble the other variant part of the usage */
      if ((knownVMs[0].flag == VM_KNOWN) ||
          (knownVMs[0].flag == VM_IF_SERVER_CLASS)) {
!       vm1 = (*env)->NewStringUTF(env, knownVMs[0].name);
!       vm2 =  (*env)->NewStringUTF(env, knownVMs[0].name+1);
        (*env)->CallStaticVoidMethod(env, cls, vmSelect, vm1, vm2);
      }
      for (i=1; i<knownVMsCount; i++) {
        if (knownVMs[i].flag == VM_KNOWN) {
!         vm1 =  (*env)->NewStringUTF(env, knownVMs[i].name);
!         vm2 =  (*env)->NewStringUTF(env, knownVMs[i].name+1);
          (*env)->CallStaticVoidMethod(env, cls, vmSelect, vm1, vm2);
        }
      }
      for (i=1; i<knownVMsCount; i++) {
        if (knownVMs[i].flag == VM_ALIASED_TO) {
!         vm1 =  (*env)->NewStringUTF(env, knownVMs[i].name);
!         vm2 =  (*env)->NewStringUTF(env, knownVMs[i].alias+1);
          (*env)->CallStaticVoidMethod(env, cls, vmSynonym, vm1, vm2);
        }
      }
  
      /* The first known VM is the default */
--- 1519,1552 ----
                                          "appendVmErgoMessage", "(ZLjava/lang/String;)V"));
  
      NULL_CHECK(printHelp = (*env)->GetStaticMethodID(env, cls,
                                          "printHelpMessage", "(Z)V"));
  
!     NULL_CHECK(jprogname = (*env)->NewStringUTF(env, _program_name));
  
      /* Initialize the usage message with the usual preamble */
      (*env)->CallStaticVoidMethod(env, cls, initHelp, jprogname);
  
  
      /* Assemble the other variant part of the usage */
      if ((knownVMs[0].flag == VM_KNOWN) ||
          (knownVMs[0].flag == VM_IF_SERVER_CLASS)) {
!       NULL_CHECK(vm1 = (*env)->NewStringUTF(env, knownVMs[0].name));
!       NULL_CHECK(vm2 =  (*env)->NewStringUTF(env, knownVMs[0].name+1));
        (*env)->CallStaticVoidMethod(env, cls, vmSelect, vm1, vm2);
      }
      for (i=1; i<knownVMsCount; i++) {
        if (knownVMs[i].flag == VM_KNOWN) {
!         NULL_CHECK(vm1 =  (*env)->NewStringUTF(env, knownVMs[i].name));
!         NULL_CHECK(vm2 =  (*env)->NewStringUTF(env, knownVMs[i].name+1));
          (*env)->CallStaticVoidMethod(env, cls, vmSelect, vm1, vm2);
        }
      }
      for (i=1; i<knownVMsCount; i++) {
        if (knownVMs[i].flag == VM_ALIASED_TO) {
!         NULL_CHECK(vm1 =  (*env)->NewStringUTF(env, knownVMs[i].name));
!         NULL_CHECK(vm2 =  (*env)->NewStringUTF(env, knownVMs[i].alias+1));
          (*env)->CallStaticVoidMethod(env, cls, vmSynonym, vm1, vm2);
        }
      }
  
      /* The first known VM is the default */
*** 1556,1566 ****
        const char* defaultVM  =  knownVMs[0].name+1;
        if ((knownVMs[0].flag == VM_IF_SERVER_CLASS) && isServerClassMachine) {
          defaultVM = knownVMs[0].server_class+1;
        }
  
!       vm1 =  (*env)->NewStringUTF(env, defaultVM);
        (*env)->CallStaticVoidMethod(env, cls, vmErgo, isServerClassMachine,  vm1);
      }
  
      /* Complete the usage message and print to stderr*/
      (*env)->CallStaticVoidMethod(env, cls, printHelp, USE_STDERR);
--- 1556,1566 ----
        const char* defaultVM  =  knownVMs[0].name+1;
        if ((knownVMs[0].flag == VM_IF_SERVER_CLASS) && isServerClassMachine) {
          defaultVM = knownVMs[0].server_class+1;
        }
  
!       NULL_CHECK(vm1 =  (*env)->NewStringUTF(env, defaultVM));
        (*env)->CallStaticVoidMethod(env, cls, vmErgo, isServerClassMachine,  vm1);
      }
  
      /* Complete the usage message and print to stderr*/
      (*env)->CallStaticVoidMethod(env, cls, printHelp, USE_STDERR);