src/share/bin/java.c

*** 1,7 ****
  /*
!  * Copyright (c) 1995, 2013, 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.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1995, 2014, 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.  Oracle designates this
*** 1232,1242 ****
      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",
                 (long)(jint)Counter2Micros(end-start));
--- 1232,1243 ----
      NULL_CHECK0(mid = (*env)->GetStaticMethodID(env, cls,
                  "checkAndLoadMain",
                  "(ZILjava/lang/String;)Ljava/lang/Class;"));
  
      NULL_CHECK0(str = NewPlatformString(env, name));
!     NULL_CHECK0(result = (*env)->CallStaticObjectMethod(env, cls, mid,
!                                                         USE_STDERR, mode, str));
  
      if (JLI_IsTraceLauncher()) {
          end   = CounterGet();
          printf("%ld micro seconds to load main class\n",
                 (long)(jint)Counter2Micros(end-start));
*** 1478,1488 ****
      jstring joptString;
      jclass cls = GetLauncherHelperClass(env);
      NULL_CHECK(cls);
      NULL_CHECK(showSettingsID = (*env)->GetStaticMethodID(env, cls,
              "showSettings", "(ZLjava/lang/String;JJJZ)V"));
!     joptString = (*env)->NewStringUTF(env, optString);
      (*env)->CallStaticVoidMethod(env, cls, showSettingsID,
                                   USE_STDERR,
                                   joptString,
                                   (jlong)initialHeapSize,
                                   (jlong)maxHeapSize,
--- 1479,1489 ----
      jstring joptString;
      jclass cls = GetLauncherHelperClass(env);
      NULL_CHECK(cls);
      NULL_CHECK(showSettingsID = (*env)->GetStaticMethodID(env, cls,
              "showSettings", "(ZLjava/lang/String;JJJZ)V"));
!     NULL_CHECK(joptString = (*env)->NewStringUTF(env, optString));
      (*env)->CallStaticVoidMethod(env, cls, showSettingsID,
                                   USE_STDERR,
                                   joptString,
                                   (jlong)initialHeapSize,
                                   (jlong)maxHeapSize,