src/share/native/java/lang/ClassLoader.c

rev 10818 : 8081674: EmptyStackException at startup if running with extended or unsupported charset
Reviewed-by: mchung

*** 1,7 ****
  /*
!  * Copyright (c) 1996, 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
--- 1,7 ----
  /*
!  * Copyright (c) 1996, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 491,506 ****
      res = ptr_to_jlong(JVM_FindLibraryEntry(jlong_to_ptr(handle), cname));
      (*env)->ReleaseStringUTFChars(env, name, cname);
      return res;
  }
  /*
!  * Class:     java_lang_ClassLoader_NativeLibrary
   * Method:    findBuiltinLib
   * Signature: (Ljava/lang/String;)Ljava/lang/String;
   */
  JNIEXPORT jstring JNICALL
! Java_java_lang_ClassLoader_00024NativeLibrary_findBuiltinLib
    (JNIEnv *env, jclass cls, jstring name)
  {
      const char *cname;
      char *libName;
      int prefixLen = (int) strlen(JNI_LIB_PREFIX);
--- 491,506 ----
      res = ptr_to_jlong(JVM_FindLibraryEntry(jlong_to_ptr(handle), cname));
      (*env)->ReleaseStringUTFChars(env, name, cname);
      return res;
  }
  /*
!  * Class:     java_lang_ClassLoader
   * Method:    findBuiltinLib
   * Signature: (Ljava/lang/String;)Ljava/lang/String;
   */
  JNIEXPORT jstring JNICALL
! Java_java_lang_ClassLoader_findBuiltinLib
    (JNIEnv *env, jclass cls, jstring name)
  {
      const char *cname;
      char *libName;
      int prefixLen = (int) strlen(JNI_LIB_PREFIX);
*** 512,523 ****
  
      if (name == NULL) {
          JNU_ThrowInternalError(env, "NULL filename for native library");
          return NULL;
      }
-     // Can't call initIDs because it will recurse into NativeLibrary via
-     // FindClass to check context so set prochandle here as well.
      procHandle = getProcessHandle();
      cname = JNU_GetStringPlatformChars(env, name, 0);
      if (cname == NULL) {
          JNU_ThrowOutOfMemoryError(env, NULL);
          return NULL;
--- 512,521 ----