echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Utils: Java 9 yakkety workarounds

Browse Source
This commit is contained in:
zzz
2017-01-17 14:08:47 +00:00
parent 7cae467b59
commit a36083ab18
3 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/jrobin/java/src/engine/misc/DeallocationHelper.java
View File

@ -330,15 +330,34 @@ public class DeallocationHelper {
// drops the "-internal" suffix from the major version number for
// an early access build (Ubuntu)
javaVersionElements[0] = javaVersionElements[0].substring(0, indexOfEarlyAccessSuffix);
} else {
indexOfEarlyAccessSuffix = javaVersionElements[0].lastIndexOf("-Ubuntu");
if (indexOfEarlyAccessSuffix != -1) {
// drops the "-Ubuntu suffix from the major version number for
// an early access build (Ubuntu)
javaVersionElements[0] = javaVersionElements[0].substring(0, indexOfEarlyAccessSuffix);
}
}
}
final int major, minor;
if (javaVersionElements.length >= 2) {
major = Integer.parseInt(javaVersionElements[0]);
minor = Integer.parseInt(javaVersionElements[1]);
int min;
try {
min = Integer.parseInt(javaVersionElements[1]);
} catch (NumberFormatException nfe) {
min = 7;
}
minor = min;
} else {
major = 1;
minor = Integer.parseInt(javaVersionElements[0]);
int min;
try {
min = Integer.parseInt(javaVersionElements[0]);
} catch (NumberFormatException nfe) {
min = 7;
}
minor = min;
}
final String directBufferAttachmentFieldName;
if (minor == 1 && major <= 6)