--- icedtea-web-1.7.1/launcher/launchers.in
+++ icedtea-web-1.7.1/launcher/launchers.in
@@ -70,6 +70,12 @@
shift
done
+java_dir="`dirname ${JAVA}`"
+alt_java="alt-java"
+if [ -e "$java_dir/$alt_java" ] ; then
+ JAVA="`dirname ${JAVA}`/$alt_java"
+fi
+
k=0
COMMAND[k]="${JAVA}"
k=$((k+1))
--- icedtea-web-1.7.1/plugin/icedteanp/IcedTeaNPPlugin.cc
+++ icedtea-web-1.7.1/plugin/icedteanp/IcedTeaNPPlugin.cc
@@ -139,7 +139,8 @@
static DIR *data_directory_descriptor;
// Fully-qualified appletviewer default executable and rt.jar
-static const char* appletviewer_default_executable = ICEDTEA_WEB_JRE "/bin/java";
+static const char* appletviewer_default_executable_main = ICEDTEA_WEB_JRE "/bin/java";
+static const char* appletviewer_default_executable_alt = ICEDTEA_WEB_JRE "/bin/alt-java";
static const char* appletviewer_default_rtjar = ICEDTEA_WEB_JRE "/lib/rt.jar";
static const char* appletviewer_default_jfxrtjar = ICEDTEA_WEB_JRE "/lib/jfxrt.jar";
static const char* appletviewer_default_nashonrjar = ICEDTEA_WEB_JRE "/lib/ext/nashorn.jar";
@@ -285,13 +286,18 @@
std::string custom_jre;
bool custom_jre_defined = find_custom_jre(custom_jre);
if (custom_jre_defined) {
- if (IcedTeaPluginUtilities::file_exists(custom_jre+"/bin/java")){
+ if (IcedTeaPluginUtilities::file_exists(custom_jre+"/bin/alt-java")){
+ return custom_jre+"/bin/alt-java";
+ } else if (IcedTeaPluginUtilities::file_exists(custom_jre+"/bin/java")){
return custom_jre+"/bin/java";
} else {
PLUGIN_ERROR("Your custom jre (/bin/java check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
}
}
- return appletviewer_default_executable;
+ if (IcedTeaPluginUtilities::file_exists(appletviewer_default_executable_alt)){
+ return appletviewer_default_executable_alt;
+ }
+ return appletviewer_default_executable_main;
}
static std::string get_plugin_rt_jar(){