From d01e7fced891648a3d4bdff481c041d76763cf86 Mon Sep 17 00:00:00 2001 From: aclement Date: Thu, 15 Sep 2005 13:54:13 +0000 Subject: use the right version property. --- testing/newsrc/org/aspectj/testing/AjcTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'testing/newsrc') diff --git a/testing/newsrc/org/aspectj/testing/AjcTest.java b/testing/newsrc/org/aspectj/testing/AjcTest.java index dc30e420a..860a3ca72 100644 --- a/testing/newsrc/org/aspectj/testing/AjcTest.java +++ b/testing/newsrc/org/aspectj/testing/AjcTest.java @@ -29,11 +29,10 @@ public class AjcTest { private static boolean is14VMOrGreater = true; private static boolean is15VMOrGreater = false; - static { - String vm = System.getProperty("java.runtime.version"); - if (vm == null) { - vm = System.getProperty("java.vm.version"); - } + static { // matching logic is also in org.aspectj.util.LangUtil + String vm = System.getProperty("java.version"); // JLS 20.18.7 + if (vm==null) vm = System.getProperty("java.runtime.version"); + if (vm==null) vm = System.getProperty("java.vm.version"); if (vm.startsWith("1.3")) { is14VMOrGreater = false; } else if (vm.startsWith("1.5")) { -- cgit v1.2.3