Merge pull request #4409 from rdebusscher/CUSTCOM-142

CUSTOM-142 Delete JVM options with min max versions.
payara · Jan 10, 2020 · 7002f7a · 7002f7a
2 parents 6137f3b + d473a21
commit 7002f7a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteJvmOptions.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteJvmOptions.java
@@ -162,7 +162,8 @@ private void deleteX(final JvmOptionBag bag, final List<String> toRemove, final
         SingleConfigCode<JvmOptionBag> scc = (JvmOptionBag bag1) -> {
             List<String> jvmopts = new ArrayList<>(bag1.getJvmRawOptions());
             int orig = jvmopts.size();
-            boolean removed = jvmopts.removeIf(option -> toRemove.contains(new JvmOption(option).option));
+            // using new JvmOption(option).toString() (instead op option directly) to make sure the correct formatting is applied.
+            boolean removed = jvmopts.removeIf(option -> toRemove.contains(new JvmOption(option).toString()));
             bag1.setJvmOptions(jvmopts);
             int now = jvmopts.size();
             if (removed) {