commit 4d70cdd50d4a3d536407eaca29fd3234cdcc76fc
author Lukas Jungmann <lukas.jungmann@oracle.com> Fri Nov 03 06:05:02 2017 +0100
committer Lukas Jungmann <lukas.jungmann@oracle.com> Fri Nov 03 06:05:02 2017 +0100
tree cc610c6084add75d2873cd17a805838fb22c2cf8
parent bd51718be4c1ced7979e09acd4b6247cc85363d7

[nobug] fix sdo test failures

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>

sdo/eclipselink.sdo.test/src/org/eclipse/persistence/testing/sdo/util/CompileUtil.java

diff --git a/sdo/eclipselink.sdo.test/src/org/eclipse/persistence/testing/sdo/util/CompileUtil.java b/sdo/eclipselink.sdo.test/src/org/eclipse/persistence/testing/sdo/util/CompileUtil.java
index d49bd99..0b5c17b 100644
--- a/sdo/eclipselink.sdo.test/src/org/eclipse/persistence/testing/sdo/util/CompileUtil.java
+++ b/sdo/eclipselink.sdo.test/src/org/eclipse/persistence/testing/sdo/util/CompileUtil.java
@@ -36,7 +36,7 @@ public static synchronized CompileUtil instance() {
 
     public int compile(String classpath, Object[] javaFiles) {
         int jv = JavaSEPlatform.CURRENT.getMajor();
-        final String javaVersion = "" + jv;
+        final String javaVersion = "" + ((jv >= 9) ? jv : JavaSEPlatform.CURRENT.toString());
         final String[] args = new String[javaFiles.length + ((jv >= 9) ? 9 : 7)];
         final String javac = getJavaC();
 
@@ -47,7 +47,7 @@ public int compile(String classpath, Object[] javaFiles) {
         args[4] = javaVersion;
         args[5] = "-target";
         args[6] = javaVersion;
-        if ("9".equals(javaVersion)) {
+        if (9 >= jv) {
             args[7] = "--add-modules";
             args[8] = "java.activation";
             System.arraycopy(javaFiles, 0, args, 9, javaFiles.length);