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

8168093: Need a way for the launcher to query the JRE location using Windows registry

Browse Source 
Reviewed-by: erikj, ksrini
This commit is contained in:
Alexey Semenyuk 2016-10-17 11:04:49 -07:00 committed by Alexey Semenyuk
parent 961c824aee
commit 9af3c3f940
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jdk/src/java.base/windows/native/libjli/java_md.c
View File

@ -48,6 +48,10 @@ static jboolean GetJVMPath(const char *jrepath, const char *jvmtype,
char *jvmpath, jint jvmpathsize); char *jvmpath, jint jvmpathsize);
static jboolean GetJREPath(char *path, jint pathsize); static jboolean GetJREPath(char *path, jint pathsize);
#ifdef USE_REGISTRY_LOOKUP
jboolean GetPublicJREHome(char *buf, jint bufsize);
#endif
/* We supports warmup for UI stack that is performed in parallel /* We supports warmup for UI stack that is performed in parallel
* to VM initialization. * to VM initialization.
* This helps to improve startup of UI application as warmup phase * This helps to improve startup of UI application as warmup phase
@ -346,6 +350,14 @@ GetJREPath(char *path, jint pathsize)
} }
} }
#ifdef USE_REGISTRY_LOOKUP
/* Lookup public JRE using Windows registry. */
if (GetPublicJREHome(path, pathsize)) {
JLI_TraceLauncher("JRE path is %s\n", path);
return JNI_TRUE;
}
#endif
JLI_ReportErrorMessage(JRE_ERROR8 JAVA_DLL); JLI_ReportErrorMessage(JRE_ERROR8 JAVA_DLL);
return JNI_FALSE; return JNI_FALSE;
} }