Bug 517507: Remove Java 9 hacks that were added to the launcher in

Oxygen M7

Revert "Bug 493761: Platform won't launch on Java 9-ea builds
(InjectionException: NoClassDefFoundError:
javax/annotation/PostConstruct)"

This reverts commit 4295e27d8e41283eadba7aa2e098126b22c5a7a9.

This reverts commit 28ff351cfc1b33eb84c70b295e8a86bf8b70d21f.

This reverts commit 2e0869c0e8cf5f4125a3237f22ed6f166a065fbb.

1 files changed, 15 insertions, 11 deletions

diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipseNix.c b/features/org.eclipse.equinox.executable.feature/library/eclipseNix.c
index 5cfced7a0..bda8b3cb9 100644
--- a/features/org.eclipse.equinox.executable.feature/library/eclipseNix.c
+++ b/features/org.eclipse.equinox.executable.feature/library/eclipseNix.c
@@ -168,8 +168,7 @@ JavaResults* startJavaVM( _TCHAR* libPath, _TCHAR* vmArgs[], _TCHAR* progArgs[],
 	return startJavaJNI(libPath, vmArgs, progArgs, jarFile);
 }
 
-/* returns 1 if the JVM version is >= 9, 0 otherwise */
-int isModularVM( _TCHAR * javaVM, _TCHAR * jniLib ) {
+int isMaxPermSizeVM( _TCHAR * javaVM, _TCHAR * jniLib ) {
 	if (javaVM == NULL) {
 		return 0;
 	}
@@ -195,17 +194,22 @@ int isModularVM( _TCHAR * javaVM, _TCHAR * jniLib ) {
 				version[numChars] = '\0';
 			}
 		}
-		if (version != NULL) {
-			_TCHAR *str = version;
-			/* According to the new Java version-string scheme, the first element is
-			 * the major version number, details at http://openjdk.java.net/jeps/223 */
-			_TCHAR *majorVersion = _tcstok(str, ".-");
-			if (majorVersion != NULL && (_tcstol(majorVersion, NULL, 10) >= 9)) {
-				result = 1;
+		if (_tcsstr(buffer, "Java HotSpot(TM)") || _tcsstr(buffer, "OpenJDK")) {
+			if (version != NULL) {
+				_TCHAR *value = _tcstok(version, ".");
+				if (value != NULL && (_tcstol(value, NULL, 10) == 1)) {
+					value = _tcstok(NULL, ".");
+					if (_tcstol(value, NULL, 10) < 8) {
+						result = 1;
+					}
+				}
 			}
-			free(version);
+			break;
+		}
+		if (_tcsstr(buffer, "IBM") != NULL) {
+			result = 0;
+			break;
 		}
-		break;
 	}
 	pclose(fp);
 	return result;