Index: modules/luni/src/main/native/launcher/shared/libhlp.c =================================================================== --- modules/luni/src/main/native/launcher/shared/libhlp.c (revision 451115) +++ modules/luni/src/main/native/launcher/shared/libhlp.c (working copy) @@ -84,31 +84,9 @@ char *javaHomeModifiablePart = NULL; char *p; IDATA retval = -1; - I_32 rc; - UDATA isUpper = TRUE; - char *envvars = "JAVA_HOME\0java_home\0"; - char *envvar; PORT_ACCESS_FROM_PORT (portLib); - for (envvar = envvars; *envvar; envvar += strlen (envvar) + 1) - { - rc = hysysinfo_get_env (envvar, NULL, 0); - if (rc > 0) - { - *finalJavaHome = strBufferEnsure (portLib, *finalJavaHome, rc); - if (*finalJavaHome == NULL) - return -1; - hysysinfo_get_env (envvar, - (*finalJavaHome)->data + - strlen ((*finalJavaHome)->data), rc); - (*finalJavaHome)->remaining -= rc; - return 0; - } - } - - /* Compute the proper value for the var. */ - if ((argc < 1) || !argv) return -1;