Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c47fef805893
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e7bcde5a67bd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 29, 2017

  1. Copy the full SHA
    fc06776 View commit details

Commits on Mar 30, 2017

  1. Merge pull request #4553 from iignatev/master

    support new JDK version string scheme
    enebo authored Mar 30, 2017
    Copy the full SHA
    e7bcde5 View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 core/src/main/java/org/jruby/ext/ffi/Platform.java
5 changes: 4 additions & 1 deletion core/src/main/java/org/jruby/ext/ffi/Platform.java
Original file line number Diff line number Diff line change
@@ -232,8 +232,11 @@ protected Platform(OS_TYPE os) {
try {
String versionString = System.getProperty("java.version");
if (versionString != null) {
// remove additional version identifiers, e.g. -ea
versionString = versionString.split("-|\\+")[0];
String[] v = versionString.split("\\.");
version = Integer.valueOf(v[1]);
// starting from JDK 9, there is no leading "1." in java.version
version = Integer.valueOf(v.length > 1 ? v[1] : v[0]);
}
} catch (Exception ex) {
version = 0;