diff options
| -rw-r--r-- | src/java/jogamp/common/os/PlatformPropsImpl.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/java/jogamp/common/os/PlatformPropsImpl.java b/src/java/jogamp/common/os/PlatformPropsImpl.java index f3b7ace..0965185 100644 --- a/src/java/jogamp/common/os/PlatformPropsImpl.java +++ b/src/java/jogamp/common/os/PlatformPropsImpl.java @@ -97,9 +97,16 @@ public abstract class PlatformPropsImpl { JAVA_VERSION = System.getProperty("java.version"); JAVA_VERSION_NUMBER = new VersionNumber(JAVA_VERSION); { - final int usIdx = JAVA_VERSION.lastIndexOf("_"); - if( usIdx > 0 ) { - final String buildS = Platform.JAVA_VERSION.substring(usIdx+1); + int usIdx = JAVA_VERSION.lastIndexOf("-u"); // OpenJDK update notation + int usOff; + if( 0 < usIdx ) { + usOff = 2; + } else { + usIdx = JAVA_VERSION.lastIndexOf("_"); // Oracle update notation + usOff = 1; + } + if( 0 < usIdx ) { + final String buildS = Platform.JAVA_VERSION.substring(usIdx+usOff); final VersionNumber update = new VersionNumber(buildS); JAVA_VERSION_UPDATE = update.getMajor(); } else { |