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

Merge "Issue #2717 Force use of legacy merge sort" into omaha_14.2.1

Browse source 
Former-commit-id: ceeeb8209a [formerly 55203d0486] [formerly c598185130] [formerly c598185130 [formerly d78dbb85d5]] [formerly 54262ad318 [formerly c598185130 [formerly d78dbb85d5] [formerly 54262ad318 [formerly 566d188782f5976d2a221b5a7ab162da3e8b36ca]]]]
Former-commit-id: 54262ad318
Former-commit-id: e9362561c2ef23e54d0b927f908e987f26057351 [formerly 3b53bce38675c75e649c3c5c70ab3876d1503296] [formerly 5b84b27087 [formerly f13cb9ae26]]
Former-commit-id: 5b84b27087
Former-commit-id: c2340dfd07
This commit is contained in:
Nate Jensen 2014-01-20 17:32:15 -06:00 • committed by Gerrit Code Review
commit f4b93c62e3
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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</vmArgs>
-Dthrift.stream.maxsize=200
-Djava.util.Arrays.useLegacyMergeSort=true</vmArgs>
<vmArgsLin>-Xmx1280M</vmArgsLin>
<vmArgsWin>-Dfile.encoding=UTF-8 -Xmx768M</vmArgsWin>
</launcherArgs>

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

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