Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-12-29 12:37:40 +01:00
Code Issues Projects Releases Wiki Activity

Improve reliability of java version check in ReflectionClassLoader (#2093)

Browse Source
This commit is contained in:
Luck 2020-03-24 10:35:13 +00:00
parent 30d7768299
commit 2adea2d3dc
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/src/main/java/me/lucko/luckperms/common/dependencies/classloader/ReflectionClassLoader.java
View File

@ -52,7 +52,7 @@ public class ReflectionClassLoader implements PluginClassLoader {
}
this.addUrlMethod = Suppliers.memoize(() -> {
if (getJavaMajorVersion() >= 9) {
if (isJava9OrNewer()) {
bootstrap.getPluginLogger().info("It is safe to ignore any warning printed following this message " +
"starting with 'WARNING: An illegal reflective access operation has occurred, Illegal reflective " +
"access by " + getClass().getName() + "'.");
@ -78,16 +78,13 @@ public class ReflectionClassLoader implements PluginClassLoader {
}
}
private static int getJavaMajorVersion() {
String version = System.getProperty("java.version");
if (version.startsWith("1.")) {
version = version.substring(2, 3);
} else {
int dot = version.indexOf(".");
if (dot != -1) {
version = version.substring(0, dot);
}
private static boolean isJava9OrNewer() {
try {
// method was added in the Java 9 release
Runtime.class.getMethod("version");
return true;
} catch (NoSuchMethodException e) {
return false;
}
return Integer.parseInt(version);
}
}