From: Ben Soares <bsoares@dundee.ac.uk>
Date: Wed, 20 Nov 2019 01:13:26 +0000 (+0000)
Subject: JAL-3210 cache getdown config, remove jvmmem options for better defaults
X-Git-Tag: Develop-2_11_2_0-d20201215~88^2~10
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=390934f61c1d821fadb030f5541b1a061d1952dc;p=jalview.git

JAL-3210 cache getdown config, remove jvmmem options for better defaults
---

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index dfaa6e6..8ca010a 100644
Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ
diff --git a/getdown/lib/getdown-launcher-local.jar b/getdown/lib/getdown-launcher-local.jar
index 82e1a2d..ab2a28a 100644
Binary files a/getdown/lib/getdown-launcher-local.jar and b/getdown/lib/getdown-launcher-local.jar differ
diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index d395991..f7ca0f8 100644
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index f41bf6a..7cc3e09 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -584,6 +584,10 @@ public class Application
     public Config init (boolean checkPlatform)
         throws IOException
     {
+    	if (_initialised && _initialisedConfig != null)
+    	{
+    		return _initialisedConfig;
+    	}
         Config config = null;
         File cfgfile = _config;
         Config.ParseOpts opts = Config.createOpts(checkPlatform);
@@ -845,6 +849,8 @@ public class Application
         _dockName = config.getString("ui.name");
         _dockIconPath = config.getString("ui.mac_dock_icon", "../desktop.icns");
 
+        _initialised = true;
+        _initialisedConfig = config;
         return config;
     }
 
@@ -1995,4 +2001,7 @@ public class Application
     protected static File _locatorFile;
     protected static List<File> _startupFiles = new ArrayList<>();
     public static final String LOCATOR_FILE_EXTENSION = "jvl";
+
+    private boolean _initialised = false;
+    private Config _initialisedConfig = null;
 }
diff --git a/gradle.properties b/gradle.properties
index cda2658..6119b45 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -63,8 +63,9 @@ getdown_txt_title = Jalview
 getdown_txt_allow_offline = true
 getdown_txt_max_concurrent_downloads = 10
 # now got better defaults when not set
-getdown_txt_jalview.jvmmempc = 900
-#getdown_txt_jalview.jvmmemmax = 32G # now got better defaults when not set
+#getdown_txt_jalview.jvmmempc = 90
+# now got better defaults when not set
+#getdown_txt_jalview.jvmmemmax = 2G
 getdown_txt_multi_jvmarg = -Dgetdownappdir=%APPDIR%
 getdown_txt_strict_comments = true
 getdown_txt_title = Jalview
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index dfaa6e6..8ca010a 100644
Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ
diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar
index dfaa6e6..8ca010a 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ