git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3477 Javadoc, addition of -jvmmempc and -jvmmemmax args detection and some small...
[jalview.git]
/
src
/
jalview
/
bin
/
MemorySetting.java
diff --git
a/src/jalview/bin/MemorySetting.java
b/src/jalview/bin/MemorySetting.java
index
f7c40cf
..
7849ba2
100644
(file)
--- a/
src/jalview/bin/MemorySetting.java
+++ b/
src/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
// 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(
&& memmax > NOMEM_MAX_HEAPSIZE_GB_DEFAULT * GIGABYTE)
{
System.out.println(