--- a/src/jdk.jpackager/share/classes/jdk/jpackager/internal/JLinkBundlerHelper.java Wed Nov 21 13:53:17 2018 -0500
+++ b/src/jdk.jpackager/share/classes/jdk/jpackager/internal/JLinkBundlerHelper.java Wed Nov 21 17:50:46 2018 -0500
@@ -45,7 +45,7 @@
import java.util.ResourceBundle;
import java.util.Set;
-import jdk.jpackager.internal.builders.AbstractAppImageBuilder;
+import jdk.jpackager.internal.AbstractAppImageBuilder;
import jdk.tools.jlink.internal.packager.AppRuntimeImageBuilder;
public final class JLinkBundlerHelper {
@@ -182,6 +182,7 @@
StandardBundlerParam.ADD_MODULES.fetchFrom(params),
limitModules, JRE_MODULES_FILENAME);
+
if (javaBasePath != null && javaBasePath.toFile().exists()) {
result = RedistributableModules.getModuleVersion(
javaBasePath.toFile(), modulePath, addModules, limitModules);
@@ -278,12 +279,10 @@
modularJars.toString()));
}
}
-
Set<String> redistModules = getRedistributableModules(
modulePath, addModules, limitModules, JRE_MODULES_FILENAME);
addModules.addAll(redistModules);
-
if (imageBuilder.getPlatformSpecificModulesFile() != null) {
Set<String> platformModules =
RedistributableModules.getRedistributableModules(