stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8232624: Java cannot start: NewStringPlatform missing

Browse Source 
Reviewed-by: dholmes, alanb, redestad
This commit is contained in:
Alexey Ivanov 2019-10-21 21:36:26 +01:00
parent c483fbe6d6
commit 16f3919405
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/classfile/javaClasses.cpp
View File

@ -377,7 +377,7 @@ Handle java_lang_String::create_from_platform_dependent_str(const char* str, TRA
if (_to_java_string_fn == NULL) { if (_to_java_string_fn == NULL) {
void *lib_handle = os::native_java_library(); void *lib_handle = os::native_java_library();
_to_java_string_fn = CAST_TO_FN_PTR(to_java_string_fn_t, os::dll_lookup(lib_handle, "JNU_NewStringPlatform")); _to_java_string_fn = CAST_TO_FN_PTR(to_java_string_fn_t, os::dll_lookup(lib_handle, "NewStringPlatform"));
if (_to_java_string_fn == NULL) { if (_to_java_string_fn == NULL) {
fatal("NewStringPlatform missing"); fatal("NewStringPlatform missing");
} }

7
src/java.base/share/native/libjava/jni_util.c
View File

@ -791,6 +791,13 @@ InitializeEncoding(JNIEnv *env, const char *encname)
CHECK_NULL(String_value_ID); CHECK_NULL(String_value_ID);
} }
// This alias is used for compatibility with 32 bit Windows
JNIEXPORT jstring
NewStringPlatform(JNIEnv *env, const char *str)
{
return JNU_NewStringPlatform(env, str);
}
JNIEXPORT jstring JNICALL JNIEXPORT jstring JNICALL
JNU_NewStringPlatform(JNIEnv *env, const char *str) JNU_NewStringPlatform(JNIEnv *env, const char *str)
{ {

3
src/java.base/share/native/libjava/jni_util.h
View File

@ -93,6 +93,9 @@ JNIEXPORT void JNICALL
JNU_ThrowIOExceptionWithLastError(JNIEnv *env, const char *defaultDetail); JNU_ThrowIOExceptionWithLastError(JNIEnv *env, const char *defaultDetail);
/* Convert between Java strings and i18n C strings */ /* Convert between Java strings and i18n C strings */
JNIEXPORT jstring
NewStringPlatform(JNIEnv *env, const char *str);
JNIEXPORT const char * JNIEXPORT const char *
GetStringPlatformChars(JNIEnv *env, jstring jstr, jboolean *isCopy); GetStringPlatformChars(JNIEnv *env, jstring jstr, jboolean *isCopy);