From a481848c679e16da5d2c25663b46fdb5d011853b Mon Sep 17 00:00:00 2001 From: Ron Anderson Date: Mon, 20 Jan 2014 17:22:26 -0600 Subject: [PATCH] Issue #2717 Force use of legacy merge sort Change-Id: Ic37aa4af53f18cc1cbe9bd23420cb692dfa300d7 Former-commit-id: 66bbc997849bdd843c4e36de1d1b7de5e519d6a5 [formerly de97ec032fe99ea00991b87ede1e94b9004d3848 [formerly df2af35f3c54b30915cdb6ccebaa30c0e05c7725]] Former-commit-id: de97ec032fe99ea00991b87ede1e94b9004d3848 Former-commit-id: 34d1b95a79e9dc77633217bbbfaa21039e37d973 --- cave/com.raytheon.viz.product.awips/awips.product | 3 ++- edexOsgi/build.edex/esb/conf/wrapper.conf | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cave/com.raytheon.viz.product.awips/awips.product b/cave/com.raytheon.viz.product.awips/awips.product index 4c76cd21a1..39924ee234 100644 --- a/cave/com.raytheon.viz.product.awips/awips.product +++ b/cave/com.raytheon.viz.product.awips/awips.product @@ -30,7 +30,8 @@ -XX:OnOutOfMemoryError="capture -t no -p $pid &" -Dlogback.configurationFile=logback-viz-core.xml -Dlogback.statusListenerClass=com.raytheon.uf.common.status.logback.UFLogbackInternalStatusListener --Dthrift.stream.maxsize=200 +-Dthrift.stream.maxsize=200 +-Djava.util.Arrays.useLegacyMergeSort=true -Xmx1280M -Dfile.encoding=UTF-8 -Xmx768M diff --git a/edexOsgi/build.edex/esb/conf/wrapper.conf b/edexOsgi/build.edex/esb/conf/wrapper.conf index 4fd3dc3e13..7d96702b5a 100644 --- a/edexOsgi/build.edex/esb/conf/wrapper.conf +++ b/edexOsgi/build.edex/esb/conf/wrapper.conf @@ -93,6 +93,9 @@ wrapper.java.additional.4=-Dorg.apache.camel.jmx.disabled=true # Enforces GMT to be used as the timezone wrapper.java.additional.5=-Duser.timezone=GMT +# Force Java 7 to use earlier sort algorithm +wrapper.java.additional.6=-Djava.util.Arrays.useLegacyMergeSort=true + # garbage collection settings wrapper.java.additional.gc.1=-XX:+UseConcMarkSweepGC wrapper.java.additional.gc.2=-XX:+CMSIncrementalMode