xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2909 Remove useLegacyMergeSort java parameter" into development

Browse source 
Former-commit-id: befff7be3a [formerly a2a46becc8 [formerly a221c18b0195cb5b8dd284c4f3ef1266a8efd999]]
Former-commit-id: a2a46becc8
Former-commit-id: 57faf2b7b1
This commit is contained in:
Nate Jensen 2014-03-13 12:41:14 -05:00 • committed by Gerrit Code Review
commit 57ba744427
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cave/com.raytheon.viz.product.awips/awips.product
View file

@ -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</vmArgs>
<vmArgsLin>-Xmx1280M -XX:MaxDirectMemorySize=2G</vmArgsLin>
<vmArgsWin>-Dfile.encoding=UTF-8 -Xmx768M</vmArgsWin>

3
edexOsgi/build.edex/esb/conf/wrapper.conf
View file

@ -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