Fix Java 8 Property Missing problem

Signed-off-by: Brian Decker <bmdecker@us.ibm.com>
scottmarlow · Mar 4, 2021 · fb31ba2 · fb31ba2
1 parent 7b72b52
commit fb31ba2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/com/sun/ts/lib/harness/TSScript.java b/src/com/sun/ts/lib/harness/TSScript.java
@@ -232,7 +232,10 @@ public Status run(String[] args, TestDescription td, TestEnvironment env) {
       TestUtil
           .logHarness("keywords (to be passed to tests) set to:  " + keywords);
       pTestProps.put("current.keywords", keywords);
-      pTestProps.put("jimage.dir", propMgr.getProperty("jimage.dir"));
+      String version = (String)System.getProperties().get("java.version");
+      if (!version.startsWith("1.")) {
+        pTestProps.put("jimage.dir", propMgr.getProperty("jimage.dir"));
+      }
 
       // so we know what kind of test this is
       String finderType = td.getParameter("finder");