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 aba5399a389945f2e1a631e7eef414270e710702..144a37eb656491084ed4122267a5e846da0b8010 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java @@ -198,7 +198,7 @@ public class MessageOutputStream extends OutputStream { WriteStatus ws = null; synchronized (_dataLock) { long flushTime = _lastBuffered + _passiveFlushDelay; - if ( (_valid > 0) && (flushTime < _context.clock().now()) ) { + if ( (_valid > 0) && (flushTime <= _context.clock().now()) ) { if (_log.shouldLog(Log.DEBUG)) _log.debug("doFlush() valid = " + _valid); if ( (_buf != null) && (_dataReceiver != null) ) { diff --git a/history.txt b/history.txt index 0a636562cf57a1480f3ed156cfe82a816bff264b..389ac73c6221160806f1a070047da9fd19bfb714 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,7 @@ -$Id: history.txt,v 1.137 2005/02/03 08:39:47 smeghead Exp $ +$Id: history.txt,v 1.138 2005/02/06 17:14:46 jrandom Exp $ + +2005-02-07 jrandom + * Fixed a race in the streaming lib's delayed flush algorithm (thanks anon!) 2005-02-06 Sugadude * Added a filter to the addressbook to remove entries that dont end in ".i2p" diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index b262684682a94a041e6e31243190936bf4520f04..9ecdab585f2602cf3360234c110a1102087b8eb1 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -15,9 +15,9 @@ import net.i2p.CoreVersion; * */ public class RouterVersion { - public final static String ID = "$Revision: 1.136 $ $Date: 2005/01/21 20:53:02 $"; + public final static String ID = "$Revision: 1.137 $ $Date: 2005/01/23 03:22:11 $"; public final static String VERSION = "0.4.2.6"; - public final static long BUILD = 6; + public final static long BUILD = 7; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION); System.out.println("Router ID: " + RouterVersion.ID);