From fb5ef8300961e3902bbf32c2720574c5f70c3ba6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 28 Apr 2016 02:39:32 +0000
Subject: [PATCH] fixup jbigi version display
---
apps/routerconsole/jsp/logs.jsp | 3 ++-
core/java/src/net/i2p/util/NativeBigInteger.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index 43f60fee31..483642c60b 100644
--- a/apps/routerconsole/jsp/logs.jsp
+++ b/apps/routerconsole/jsp/logs.jsp
@@ -34,7 +34,8 @@
<b>Platform:</b> <%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%><br>
<b>Processor:</b> <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)<br>
<b>Jbigi:</b> <%=net.i2p.util.NativeBigInteger.loadStatus()%><br>
-<b>Jbigi version:</b> <%=net.i2p.util.NativeBigInteger.getJbigiVersion()%> GMP <%=net.i2p.util.NativeBigInteger.getLibGMPVersion()%><br>
+<b>Jbigi version:</b> <%=net.i2p.util.NativeBigInteger.getJbigiVersion()%><br>
+<b>GMP version:</b> <%=net.i2p.util.NativeBigInteger.getLibGMPVersion()%><br>
<b>Encoding:</b> <%=System.getProperty("file.encoding")%><br>
<b>Charset:</b> <%=java.nio.charset.Charset.defaultCharset().name()%><br>
</p>
diff --git a/core/java/src/net/i2p/util/NativeBigInteger.java b/core/java/src/net/i2p/util/NativeBigInteger.java
index 997f6ebb3e..d677525331 100644
--- a/core/java/src/net/i2p/util/NativeBigInteger.java
+++ b/core/java/src/net/i2p/util/NativeBigInteger.java
@@ -582,7 +582,8 @@ public class NativeBigInteger extends BigInteger {
warn("jbigi version " + _jbigiVersion + " but GMP version not available???", t);
}
}
- warn("jbigi version: " + _jbigiVersion + "; GMP version: " + _libGMPVersion);
+ // Don't overwrite _loadStatus
+ //warn("jbigi version: " + _jbigiVersion + "; GMP version: " + _libGMPVersion);
}
/**
--
GitLab