diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java index 6b79c4061..3419ba214 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java @@ -218,6 +218,9 @@ public class ConfigServiceHandler extends FormHandler { } else if (_("Do not view console on startup").equals(_action)) { browseOnStartup(false); addFormNotice(_("Console is not to be shown on startup")); + } else if (_("Force GC").equals(_action)) { + Runtime.getRuntime().gc(); + addFormNotice(_("Full garbage collection requested")); } else { //addFormNotice("Blah blah blah. whatever. I'm not going to " + _action); } diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp index 628010685..303fa4d31 100644 --- a/apps/routerconsole/jsp/configservice.jsp +++ b/apps/routerconsole/jsp/configservice.jsp @@ -62,17 +62,21 @@

<%=intl._("Debugging")%>

<%=intl._("View the job queue")%> - <% if (System.getProperty("wrapper.version") != null) { %> +<% if (System.getProperty("wrapper.version") != null) { %>

<%=intl._("At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to wrapper.log.")%>

-
- " > -
+
<% } %> +
+ " > +<% if (System.getProperty("wrapper.version") != null) { %> + " > +<% } %> +

<%=intl._("Launch browser on router startup?")%>

<%=intl._("I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at")%> http://127.0.0.1:7657/ .


- " > - " > + " > + " >
diff --git a/history.txt b/history.txt index f2051cf13..8d9d2763e 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,15 @@ +2012-10-05 zzz + * configservice.jsp: Add GC button + * DataHelper: Sanity checks in storeProps(), use + storeProps() for router config again + * SSU: + - More synchronization fixes + - Reduce chance of dup acks in a single message + - Reduce max unsent acks to 50 + - Use last ack time in ping decision too + - Reduce ack delay + * TunnelPoolManager: Fix early NPE (ticket #724) + 2012-10-03 zzz * NTCP: Reduce conLock contention * SSU: diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index c10128fe6..fecba78d6 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 6; + public final static long BUILD = 7; /** for example "-test" */ public final static String EXTRA = "";