diff --git a/history.txt b/history.txt index c84d07cc6..7564dec1f 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2012-07-21 zzz + * i2psnark: Remove dark theme + * SSU: Remove exception creation (ticket #665) + 2012-07-19 str4d * Home page: replaced itoopie with an eepsite icon (c/o dr|z3d) for eepsites with no icon of their own. diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index b7509f1d3..0e04b1445 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,10 +18,10 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 25; + public final static long BUILD = 26; /** for example "-test" */ - public final static String EXTRA = ""; + public final static String EXTRA = "-rc"; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION); diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java index 1f288155d..f3f8a9ea4 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageState.java @@ -138,7 +138,8 @@ class OutboundMessageState { if (_messageBuf != null && !_released) { _cache.release(_messageBuf); _released = true; - _releasedBy = new Exception ("Released on " + new Date() + " by:"); + if (_log.shouldLog(Log.WARN)) + _releasedBy = new Exception ("Released on " + new Date() + " by:"); } //_messageBuf = null; }