From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Mon, 19 Dec 2016 07:55:48 +0000 (+0200)
Subject: Fix desktop product configuration
X-Git-Tag: v1.25.0^2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=c3dbc3ffd02ee897f2abb48241cbcf4c5cc50548;p=simantics%2Fplatform.git

Fix desktop product configuration

Removed -Djava.net.preferIPv4Stack=true which is totally out of date. It
was an early day procore hack.

Added -Djava.util.Arrays.useLegacyMergeSort=true because the G2D scene
graph comparator for some still unknown reason runs into problems with
Java's TimSort implementation.

refs #6621

Change-Id: If931e8bfe60525015166813ac479f0aadeac8f90
---

diff --git a/bundles/org.simantics.desktop.product/simantics-desktop.product b/bundles/org.simantics.desktop.product/simantics-desktop.product
index af09f04b7..109d06cc5 100644
--- a/bundles/org.simantics.desktop.product/simantics-desktop.product
+++ b/bundles/org.simantics.desktop.product/simantics-desktop.product
@@ -26,10 +26,10 @@ org.eclipse.e4.ui.css.theme.e4_classic
 -Xmx500M
 -Xshare:off
 -XX:MaxPermSize=192m
--Djava.net.preferIPv4Stack=true
 -Dorg.simantics.workbench.application.showFastViewBars=false
 -Dorg.simantics.workbench.application.showPerspectiveBar=false
 -Dorg.simantics.workbench.application.excludePerspectiveFromTitle=true
+-Djava.util.Arrays.useLegacyMergeSort=true
 -Declipse.workaround.bug467000=true
       </vmArgs>
       <vmArgsWin>-Dorg.osgi.framework.os.name=win32
@@ -60,6 +60,7 @@ org.eclipse.e4.ui.css.theme.e4_classic
       <feature id="org.simantics.desktop.product" version="1.0.0.qualifier"/>
    </features>
 
+
    <preferencesInfo>
       <targetfile overwrite="false"/>
    </preferencesInfo>