From: Ben Soares <bsoares@dundee.ac.uk>
Date: Fri, 10 Jan 2020 12:40:28 +0000 (+0000)
Subject: JAL-3477 updated getdown's jalview.bin.MemorySetting
X-Git-Tag: Develop-2_11_2_0-d20201215~88^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4d2f5f5f9486e63b1123b92209f6d6a478c73c09;p=jalview.git

JAL-3477 updated getdown's jalview.bin.MemorySetting
---

diff --git a/getdown/src/getdown/core/src/main/java/jalview/bin/MemorySetting.java b/getdown/src/getdown/core/src/main/java/jalview/bin/MemorySetting.java
index f7c40cf..7849ba2 100644
--- a/getdown/src/getdown/core/src/main/java/jalview/bin/MemorySetting.java
+++ b/getdown/src/getdown/core/src/main/java/jalview/bin/MemorySetting.java
@@ -257,9 +257,8 @@ public class MemorySetting
     // jvmmempc was set OR neither jvmmempc nor jvmmemmax were set), let's cap
     // maxMemLong to 8GB
     if (memoryPercentError && mempc == -1
-    // && (jvmmempcarg != null || (jvmmempcarg == null && jvmmemmaxarg == null))
-    // the above is easier to understand but simplified to
-            && !(jvmmempcarg == null && jvmmemmaxarg != null)
+            && !(jvmmempcarg == null && jvmmemmaxarg != null) // the same as (jvmmempcarg != null || (jvmmempcarg == null && jvmmemmaxarg
+                                                              // == null))
             && memmax > NOMEM_MAX_HEAPSIZE_GB_DEFAULT * GIGABYTE)
     {
       System.out.println(