Bug 944 - Platform doesn't parse early-access java-version string properly (JAVA_VERSION_UPDATE)

Fix JAVA_VERSION_UPDATE for early release versions.

Early access java versions are e.g. '1.7.0_60-ea'
where releases simply are named: '1.7.0_60'.

1 files changed, 4 insertions, 5 deletions

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();