diff --git a/cave/build/cave/memorySettings.xml b/cave/build/cave/memorySettings.xml
index 918392b814..af650c1add 100644
--- a/cave/build/cave/memorySettings.xml
+++ b/cave/build/cave/memorySettings.xml
@@ -394,7 +394,7 @@
wfo
- 3072M
+ 2560M
@@ -433,7 +433,7 @@
cwsu
- 3072M
+ 2560M
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/AbstractSaveParameterDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/AbstractSaveParameterDialog.java
index d96b935d09..da76c94e5c 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/AbstractSaveParameterDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/AbstractSaveParameterDialog.java
@@ -47,6 +47,7 @@ import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.util.ITimer;
import com.raytheon.uf.common.time.util.TimeUtil;
+import com.raytheon.uf.common.util.memory.GarbageUtil;
import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.core.GfeClientConfig;
@@ -68,6 +69,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
* Feb 13, 2013 1597 randerso Made number of concurrent save threads a configurable value.
* Added logging to support GFE Performance metrics
* Nov 20, 2013 2488 randerso Changed to use DejaVu font
+ * Jun 16, 2014 3274 njensen Garbage collect after save is finished
*
*
*
@@ -236,6 +238,11 @@ public abstract class AbstractSaveParameterDialog extends CaveJFACEDialog
.saveFinished(allSuccessful.get());
}
});
+ /*
+ * this dialog is already blocking so a user's not going to
+ * notice the pause caused by a garbage collect
+ */
+ GarbageUtil.releaseMemoryToOS();
}
return Status.OK_STATUS;
}
diff --git a/cave/com.raytheon.viz.product.awips/awips.product b/cave/com.raytheon.viz.product.awips/awips.product
index ffa33d0a95..d7ad8aac7f 100644
--- a/cave/com.raytheon.viz.product.awips/awips.product
+++ b/cave/com.raytheon.viz.product.awips/awips.product
@@ -16,10 +16,9 @@
-data @user.home/caveData -user @user.home/caveData -clean
-consoleLog
- -Xincgc -Dosgi.instance.area.readOnly=true
+ -XX:+UseG1GC
+-Dosgi.instance.area.readOnly=true
-Declipse.log.enabled=false
--XX:+UnlockDiagnosticVMOptions
--XX:+UnsyncloadClass
-Dorg.eclipse.update.reconcile=false
-XX:MaxPermSize=128m
-Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme
@@ -32,7 +31,7 @@
-Dlogback.statusListenerClass=com.raytheon.uf.common.status.logback.UFLogbackInternalStatusListener
-Dthrift.stream.maxsize=200
-Dviz.memory.warn.threshold=98
- -Xmx1280M -XX:MaxDirectMemorySize=2G
+ -Xmx2048M -XX:MaxDirectMemorySize=2G
-Dfile.encoding=UTF-8 -Xmx768M
diff --git a/cave/com.raytheon.viz.product.awips/developer.product b/cave/com.raytheon.viz.product.awips/developer.product
index fbf31408d4..b71bb0e44e 100644
--- a/cave/com.raytheon.viz.product.awips/developer.product
+++ b/cave/com.raytheon.viz.product.awips/developer.product
@@ -15,9 +15,10 @@
-data @user.home/caveData -user @user.home/caveData -clean -consoleLog -alertviz
- -Xincgc -Xmx1024M -Dosgi.instance.area.readOnly=true
+ -Xmx1536M
+-XX:+UseG1GC
+-Dosgi.instance.area.readOnly=true
-Declipse.log.enabled=false
--XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass
-Dorg.eclipse.update.reconcile=false -XX:MaxPermSize=256m
-Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme
-Dqpid.dest_syntax=BURL