diff -r d28d38406872 -r eac9018748b3 src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java	Mon Mar 18 09:09:36 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java	Thu Mar 21 13:46:28 2019 -0400
@@ -124,11 +124,9 @@
     private static Map<String, CLIOptions> argIds = new HashMap<>();
     private static Map<String, CLIOptions> argShortIds = new HashMap<>();
 
-    {
+    static {
         // init maps for parsing arguments
-        EnumSet<CLIOptions> options = EnumSet.allOf(CLIOptions.class);
-
-        options.forEach(option -> {
+        (EnumSet.allOf(CLIOptions.class)).forEach(option -> {
             argIds.put(option.getIdWithPrefix(), option);
             if (option.getShortIdWithPrefix() != null) {
                 argShortIds.put(option.getShortIdWithPrefix(), option);
@@ -137,7 +135,19 @@
     }
 
     public Arguments(String[] args) throws PackagerException {
-        initArgumentList(args);
+        argList = new ArrayList<String>(args.length);
+        for (String arg : args) {
+            argList.add(arg);
+        }
+        Log.debug ("\njpackage argument list: \n" + argList + "\n");
+        pos = 0;
+
+        deployParams = new DeployParams();
+        bundleType = BundlerType.NONE;
+
+        allOptions = new ArrayList<>();
+
+        addLaunchers = new ArrayList<>();
     }
 
     // CLIOptions is public for DeployParamsTest
@@ -474,22 +484,6 @@
         PLATFORM_LINUX;
     }
 
-    private void initArgumentList(String[] args) throws PackagerException {
-        argList = new ArrayList<String>(args.length);
-        for (String arg : args) {
-            argList.add(arg);
-        }
-        Log.debug ("\njpackage argument list: \n" + argList + "\n");
-        pos = 0;
-
-        deployParams = new DeployParams();
-        bundleType = BundlerType.NONE;
-
-        allOptions = new ArrayList<>();
-
-        addLaunchers = new ArrayList<>();
-    }
-
     public boolean processArguments() throws Exception {
         try {