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

Updates after review:

Browse Source 
Fix logic error in snark warning
Change Java 9 log warning to Java 10
Fix fallback tunnel pool stat name
Don't include geoip in this release
Update Russian translations
This commit is contained in:
zzz
2018-04-10 12:42:44 +00:00
parent db72f87b34
commit 3c7898160e
8 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@ -330,8 +330,8 @@ public class RouterConsoleRunner implements RouterApp {
boolean noPack200 = (PluginStarter.pluginsEnabled(_context) || !NewsHelper.isUpdateDisabled(_context)) &&
!FileUtil.isPack200Supported();
boolean openARM = SystemVersion.isARM() && SystemVersion.isOpenJDK();
boolean isJava9 = SystemVersion.isJava9();
if (noJava7 || noPack200 || openARM || isJava9) {
boolean isJava10 = SystemVersion.isJava10();
if (noJava7 || noPack200 || openARM || isJava10) {
String s = "Java version: " + System.getProperty("java.version") +
" OS: " + System.getProperty("os.name") + ' ' +
System.getProperty("os.arch") + ' ' +
@ -354,8 +354,8 @@ public class RouterConsoleRunner implements RouterApp {
log.logAlways(net.i2p.util.Log.WARN, s);
System.out.println("Warning: " + s);
}
if (isJava9) {
s = "Java 9 support is beta, and not recommended for general use";
if (isJava10) {
s = "Java 10 support is beta, and not recommended for general use";
log.logAlways(net.i2p.util.Log.WARN, s);
System.out.println("Warning: " + s);
}