From b366a4b9420a02bad4eb4317cc1fac3f1e0737ea Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Mon, 7 Feb 2005 10:04:23 +0000
Subject: [PATCH] 2005-02-07  jrandom     * Fixed a race in the streaming lib's
 delayed flush algorithm (thanks anon!)

---
 .../src/net/i2p/client/streaming/MessageOutputStream.java    | 2 +-
 history.txt                                                  | 5 ++++-
 router/java/src/net/i2p/router/RouterVersion.java            | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

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 aba5399a3..144a37eb6 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 0a636562c..389ac73c6 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 b26268468..9ecdab585 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);