Merge pull request #13 from jGauravGupta/NP-4

NP-4 Disable JavaDB startup by default from Payara Server plugin
payara · Nov 30, 2018 · 8a773b5 · 8a773b5
2 parents 41eb648 + 9b65404
commit 8a773b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/payara.common/src/org/netbeans/modules/payara/common/PayaraInstance.java b/payara.common/src/org/netbeans/modules/payara/common/PayaraInstance.java
@@ -1547,8 +1547,7 @@ private Map<String, String> prepareProperties(
                 DEFAULT_ADMIN_PORT);
         updateString(properties, PayaraModule.SESSION_PRESERVATION_FLAG,
                 "true");
-        updateString(properties, PayaraModule.START_DERBY_FLAG,
-                isRemote ? "false" : "true");
+        updateString(properties, PayaraModule.START_DERBY_FLAG, "false");
         updateString(properties, PayaraModule.USE_IDE_PROXY_FLAG, "true");
         updateString(properties, PayaraModule.DRIVER_DEPLOY_FLAG, "true");
         updateString(properties, PayaraModule.HTTPHOST_ATTR, "localhost");

diff --git a/payara.common/src/org/netbeans/modules/payara/common/registration/AutomaticRegistration.java b/payara.common/src/org/netbeans/modules/payara/common/registration/AutomaticRegistration.java
@@ -224,7 +224,7 @@ private static boolean registerServerInstanceFO(FileObject serverInstanceDir, St
             instanceFO.setAttribute(PayaraModule.HTTPHOST_ATTR, "localhost"); // NOI18N
             instanceFO.setAttribute(PayaraModule.JVM_MODE, PayaraModule.NORMAL_MODE);
             instanceFO.setAttribute(PayaraModule.SESSION_PRESERVATION_FLAG, true);
-            instanceFO.setAttribute(PayaraModule.START_DERBY_FLAG, true);
+            instanceFO.setAttribute(PayaraModule.START_DERBY_FLAG, false);
             instanceFO.setAttribute(PayaraModule.USE_IDE_PROXY_FLAG, true);
             instanceFO.setAttribute(PayaraModule.USE_SHARED_MEM_ATTR, false);