--- old/modules/jdk.packager/src/antplugin/java/com/sun/javafx/tools/ant/DeployFXTask.java	2016-12-08 11:52:48.000000000 -0800
+++ new/modules/jdk.packager/src/antplugin/java/com/sun/javafx/tools/ant/DeployFXTask.java	2016-12-08 11:52:47.000000000 -0800
@@ -240,29 +240,7 @@
                 deployParams.setId(app.get().id);
                 deployParams.setServiceHint(app.get().daemon);
 
-                if (runtime != null) {
-                    for (String s : runtime.getAddModules()) {
-                        deployParams.addAddModule(s);
-                    }
-
-                    for (String s : runtime.getLimitModules()) {
-                        deployParams.addLimitModule(s);
-                    }
-
-                    deployParams.setModulePath(runtime.getModulePath());
-
-                    Boolean stripNativeCommands = runtime.getStripNativeCommands();
-
-                    if (stripNativeCommands != null) {
-                        deployParams.setStripNativeCommands(stripNativeCommands);
-                    }
-
-                    Boolean detectModules = runtime.getDetectModules();
-
-                    if (detectModules != null) {
-                        deployParams.setDetectModules(detectModules);
-                    }
-                }
+                setRuntime();
             }
 
             if (appInfo != null) {
@@ -312,6 +290,8 @@
                 deployParams.setVersion(app.get().version);
                 deployParams.setId(app.get().id);
                 deployParams.setServiceHint(app.get().daemon);
+
+                setRuntime();
             }
 
             if (appInfo != null) {
@@ -384,6 +364,32 @@
         }
     }
 
+    private void setRuntime() {
+        if (runtime != null) {
+            for (String s : runtime.getAddModules()) {
+                deployParams.addAddModule(s);
+            }
+
+            for (String s : runtime.getLimitModules()) {
+                deployParams.addLimitModule(s);
+            }
+
+            deployParams.setModulePath(runtime.getModulePath());
+
+            Boolean stripNativeCommands = runtime.getStripNativeCommands();
+
+            if (stripNativeCommands != null) {
+                deployParams.setStripNativeCommands(stripNativeCommands);
+            }
+
+            Boolean detectModules = runtime.getDetectModules();
+
+            if (detectModules != null) {
+                deployParams.setDetectModules(detectModules);
+            }
+        }
+    }
+
     /**
      * Set to true if we are generating an 'extension' JNLP.
      *