diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java b/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java index e61435680..71c9ebce9 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java @@ -497,7 +497,7 @@ class MessageOutputStream extends OutputStream { if (ws.writeFailed()) throw new IOException("Flush available failed"); else if (!ws.writeAccepted()) - throw new InterruptedIOException("Flush available timed out"); + throw new InterruptedIOException("Flush available timed out (" + _writeTimeout + "ms)"); } long afterAccept = System.currentTimeMillis(); if ( (afterAccept - afterBuild > 1000) && (_log.shouldLog(Log.DEBUG)) ) diff --git a/history.txt b/history.txt index db93426e6..894223bdd 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,10 @@ +2011-01-05 zzz + * build.xml: Fix findbugs target + * Fix some miscellaneous findbugs bugs + * i2psnark: Refactor request tracking to prevent possible deadlocks + * OCMOSJ: Fix cache bug + * TrustedUpdate: Fix key store bug + 2011-01-02 zzz * Console: Disable spellcheck in textareas * Data Structures: More tweaks diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index fecba78d6..a6204817e 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 = 7; + public final static long BUILD = 8; /** for example "-test" */ public final static String EXTRA = "";