Merge error from JDK-8220505 JDK-8200758-branch
authorherrick
Wed, 13 Mar 2019 12:35:32 -0400
branchJDK-8200758-branch
changeset 57263 86e75b8f99c4
parent 57262 e2b18d61132f
child 57264 2624a38ca35a
Merge error from JDK-8220505
src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java	Wed Mar 13 07:52:16 2019 -0400
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppImageBuilder.java	Wed Mar 13 12:35:32 2019 -0400
@@ -182,7 +182,7 @@
         Map<String, ? super Object> originalParams = new HashMap<>(params);
 
         // create the primary launcher
-        createLauncherForEntryPoint(params, root);
+        createLauncherForEntryPoint(params);
 
         // Copy library to the launcher folder
         try (InputStream is_lib = getResourceAsStream(LIBRARY_NAME)) {
@@ -207,8 +207,8 @@
     @Override
     public void prepareJreFiles() throws IOException {}
 
-    private void createLauncherForEntryPoint(Map<String, ? super Object> p,
-            Path rootDir) throws IOException {
+    private void createLauncherForEntryPoint(Map<String, ? super Object> p
+            throws IOException {
         // Copy executable to Linux folder
         Path executableFile = root.resolve(getLauncherName(p));
         try (InputStream is_launcher =