Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2017-09-15 10:09:59 -0400
committerSravan Kumar Lakkimsetti2017-09-15 10:10:52 -0400
commita9a01a28b2b40e95522ccb50e8d2249330bdb806 (patch)
treed834c2c1206b69a8820b52afae12219e67ed59b6 /features
parent92dcdfc65580246055ff42d7663197ecad3cbd87 (diff)
downloadrt.equinox.framework-a9a01a28b2b40e95522ccb50e8d2249330bdb806.tar.gz
rt.equinox.framework-a9a01a28b2b40e95522ccb50e8d2249330bdb806.tar.xz
rt.equinox.framework-a9a01a28b2b40e95522ccb50e8d2249330bdb806.zip
Bug 520636 - Make sure Eclipse starts with Java 9
- eclipse doesn't restart with java 9 Change-Id: Ia5ae1413fd4f0d42082d4fa7dde2c11de3181e6e Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/eclipse.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipse.c b/features/org.eclipse.equinox.executable.feature/library/eclipse.c
index 5219553e8..3408c786c 100644
--- a/features/org.eclipse.equinox.executable.feature/library/eclipse.c
+++ b/features/org.eclipse.equinox.executable.feature/library/eclipse.c
@@ -272,6 +272,7 @@ static int noSplash = 0; /* True: do not show splash win */
static int suppressErrors = 0; /* True: do not display errors dialogs */
int secondThread = 0; /* True: start the VM on a second thread */
static int appendVmargs = 0; /* True: append cmdline vmargs to launcher.ini vmargs */
+static int skipJava9ParamRemoval = 0; /* Set to true only on macOS, if -vm was present on commandline or in eclipse.ini and points to a shared lib */
static _TCHAR* showSplashArg = NULL; /* showsplash data (main launcher window) */
static _TCHAR* splashBitmap = NULL; /* the actual splash bitmap */
@@ -1041,7 +1042,7 @@ static void adjustVMArgs(_TCHAR *javaVM, _TCHAR *jniLib, _TCHAR **vmArgv[]) {
int i = 0;
- if (!isModularVM(javaVM, jniLib)) {
+ if (!skipJava9ParamRemoval && !isModularVM(javaVM, jniLib)) {
while ((*vmArgv)[i] != NULL) {
if (_tcsncmp((*vmArgv)[i], ADDMODULES, _tcslen(ADDMODULES)) == 0) {
int j = 0, k = 0;
@@ -1692,6 +1693,9 @@ static int determineVM(_TCHAR** msg) {
return vmEEProps(vmName, msg);
case VM_LIBRARY:
+#ifdef MACOSX
+ skipJava9ParamRemoval = 1;
+#endif
ch = findCommand(vmName);
if(ch != NULL) {
jniLib = findVMLibrary(ch);

Back to the top