From 1ed943032d608a70a90609fd70ba73d70e378e09 Mon Sep 17 00:00:00 2001 From: Ron Anderson Date: Thu, 13 Mar 2014 11:39:04 -0500 Subject: [PATCH] Issue #2909 Remove useLegacyMergeSort java parameter Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a Former-commit-id: f921b5c83b3609c735c9f5d0bf3fd95d7d5e99aa [formerly d1b36c4a72128ca1ce7a0f719ca918b49ffedbf6] [formerly f921b5c83b3609c735c9f5d0bf3fd95d7d5e99aa [formerly d1b36c4a72128ca1ce7a0f719ca918b49ffedbf6] [formerly dd8bfdf9414711c7177a17550a76186fb29315fb [formerly 3aeb50672f8de7b973f234e0ab351416cbf7670b]]] Former-commit-id: dd8bfdf9414711c7177a17550a76186fb29315fb Former-commit-id: f24f542137a0c3ad2feed6449d9c6e4fc15c06f8 [formerly b82cf065b5d0a47217dfc89e18454025f31aac74] Former-commit-id: 2bf7b94fe49d88f77555f6dae1612bae0cc73310 --- cave/com.raytheon.viz.product.awips/awips.product | 1 - edexOsgi/build.edex/esb/conf/wrapper.conf | 3 --- 2 files changed, 4 deletions(-) diff --git a/cave/com.raytheon.viz.product.awips/awips.product b/cave/com.raytheon.viz.product.awips/awips.product index 0800f2b998..ffa33d0a95 100644 --- a/cave/com.raytheon.viz.product.awips/awips.product +++ b/cave/com.raytheon.viz.product.awips/awips.product @@ -31,7 +31,6 @@ -Dlogback.configurationFile=logback-viz-core.xml -Dlogback.statusListenerClass=com.raytheon.uf.common.status.logback.UFLogbackInternalStatusListener -Dthrift.stream.maxsize=200 --Djava.util.Arrays.useLegacyMergeSort=true -Dviz.memory.warn.threshold=98 -Xmx1280M -XX:MaxDirectMemorySize=2G -Dfile.encoding=UTF-8 -Xmx768M diff --git a/edexOsgi/build.edex/esb/conf/wrapper.conf b/edexOsgi/build.edex/esb/conf/wrapper.conf index 58c8e39102..f9a378082f 100644 --- a/edexOsgi/build.edex/esb/conf/wrapper.conf +++ b/edexOsgi/build.edex/esb/conf/wrapper.conf @@ -93,9 +93,6 @@ 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