diff options
| -rwxr-xr-x | make/scripts/runtest.sh | 4 | ||||
| -rw-r--r-- | src/java/jogamp/common/os/PlatformPropsImpl.java | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index b2e2d64..8251995 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -95,8 +95,8 @@ function onetest() { #onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIOUtilURICompose 2>&1 | tee -a $LOG -#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG -onetest com.jogamp.common.util.TestIOUtilURIHandling 2>&1 | tee -a $LOG +onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG +#onetest com.jogamp.common.util.TestIOUtilURIHandling 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG diff --git a/src/java/jogamp/common/os/PlatformPropsImpl.java b/src/java/jogamp/common/os/PlatformPropsImpl.java index 2f51b13..66fb5f9 100644 --- a/src/java/jogamp/common/os/PlatformPropsImpl.java +++ b/src/java/jogamp/common/os/PlatformPropsImpl.java @@ -100,14 +100,13 @@ public abstract class PlatformPropsImpl { JAVA_VERSION_NUMBER = new VersionNumber(JAVA_VERSION); { final int usIdx = JAVA_VERSION.lastIndexOf("_"); - int jvmUpdate = 0; if( usIdx > 0 ) { final String buildS = Platform.JAVA_VERSION.substring(usIdx+1); - try { - jvmUpdate = Integer.valueOf(buildS); - } catch (NumberFormatException nfe) {} + final VersionNumber update = new VersionNumber(buildS); + JAVA_VERSION_UPDATE = update.getMajor(); + } else { + JAVA_VERSION_UPDATE = 0; } - JAVA_VERSION_UPDATE = jvmUpdate; } JAVA_VM_NAME = System.getProperty("java.vm.name"); JAVA_RUNTIME_NAME = getJavaRuntimeNameImpl(); |