Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2020-05-14 15:00:10 +0000
committerSravan Kumar Lakkimsetti2021-08-13 08:35:32 +0000
commit33aded892d50aed5607ffec6a30d51549ae32386 (patch)
tree06375c2d3f53f146971c632343304a7a898fe3d0 /features/org.eclipse.equinox.executable.feature/library/eclipseNix.c
parentd07fd0e04f0a2c4cfffbbb4dfec595212e495eb5 (diff)
downloadrt.equinox.framework-33aded892d50aed5607ffec6a30d51549ae32386.tar.gz
rt.equinox.framework-33aded892d50aed5607ffec6a30d51549ae32386.tar.xz
rt.equinox.framework-33aded892d50aed5607ffec6a30d51549ae32386.zip
Bug 553538 - always prefer server VM if no arguments given
Historically we are searching fo client VM path first. Today most JRE's prefer server VM variant, so let this one be default. Users that prefer the client version still can specify that. Change-Id: Ia215b01f96e8f36c0479e867985aa00244816718 Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.framework/+/163044 Tested-by: Equinox Bot <equinox-bot@eclipse.org> Reviewed-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature/library/eclipseNix.c')
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/eclipseNix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipseNix.c b/features/org.eclipse.equinox.executable.feature/library/eclipseNix.c
index 5d35e9f2b..047a9dad5 100644
--- a/features/org.eclipse.equinox.executable.feature/library/eclipseNix.c
+++ b/features/org.eclipse.equinox.executable.feature/library/eclipseNix.c
@@ -47,11 +47,11 @@
#define MAX_LOCATION_LENGTH 40 /* none of the jvmLocations strings should be longer than this */
static const char* jvmLocations [] = { "j9vm", "../jre/bin/j9vm",
"classic", "../jre/bin/classic",
- "../lib/" JAVA_ARCH "/client",
"../lib/" JAVA_ARCH "/server",
+ "../lib/" JAVA_ARCH "/client",
"../lib/" JAVA_ARCH "/jrockit",
- "../jre/lib/" JAVA_ARCH "/client",
"../jre/lib/" JAVA_ARCH "/server",
+ "../jre/lib/" JAVA_ARCH "/client",
"../jre/lib/" JAVA_ARCH "/jrockit",
"../lib/jvm/jre/lib/" JAVA_ARCH "/client",
NULL };

Back to the top