Merge pull request #5554 from JasonFengJ9/jvmiv5

(v0.14.0-release) Set JVM_INTERFACE_VERSION to 5 for JDK12.0.1
eclipse-openj9 · Apr 18, 2019 · 4122589 · 4122589
2 parents bad1d4d + 33cf025
commit 4122589
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/runtime/j9vm/jvm.c b/runtime/j9vm/jvm.c
@@ -5348,7 +5348,11 @@ JVM_GetInterfaceVersion(void)
 
 	Trc_SC_GetInterfaceVersion_Entry();
 	if (J2SE_CURRENT_VERSION >= J2SE_V11) {
-		result = 6;
+		if (J2SE_CURRENT_VERSION == J2SE_V12) {
+			result = 5; /* JDK12 hasn't got same update as JDK11 & HEAD */
+		} else {
+			result = 6; /* JDK11 & HEAD */
+		}
 	}
 	Trc_SC_GetInterfaceVersion_Exit(result);