From 8abd99d134a4dba90e191a738b11f469dff74c5d Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Thu, 2 Dec 2004 03:20:03 +0000
Subject: [PATCH] 2004-12-01 jrandom * Fix for a race in the streaming lib
as caused by some odd SAM activity
---
.../java/src/net/i2p/client/streaming/PacketLocal.java | 4 ----
history.txt | 5 ++++-
router/java/src/net/i2p/router/RouterVersion.java | 4 ++--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java b/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java
index 814bfcd2a3..27c093f473 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java
@@ -78,14 +78,12 @@ public class PacketLocal extends Packet implements MessageOutputStream.WriteStat
_ackOn = _context.clock().now();
notifyAll();
}
- _connection = null;
}
public void cancelled() {
synchronized (this) {
_cancelledOn = _context.clock().now();
notifyAll();
}
- _connection = null;
}
/** how long after packet creation was it acked? */
@@ -116,11 +114,9 @@ public class PacketLocal extends Packet implements MessageOutputStream.WriteStat
_acceptedOn = _context.clock().now();
else
_acceptedOn = -1;
- _connection = null;
}
public void waitForCompletion(int maxWaitMs) {
- _connection = null;
long expiration = _context.clock().now()+maxWaitMs;
while (true) {
long timeRemaining = expiration - _context.clock().now();
diff --git a/history.txt b/history.txt
index b3352233e5..05d19cdc3a 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,7 @@
-$Id: history.txt,v 1.91 2004/12/01 17:31:56 jrandom Exp $
+$Id: history.txt,v 1.92 2004/12/01 19:27:27 jrandom Exp $
+
+2004-12-01 jrandom
+ * Fix for a race in the streaming lib as caused by some odd SAM activity
* 2004-12-01 0.4.2.2 released
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 6228f95e50..b1ad560310 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.96 $ $Date: 2004/12/01 17:31:56 $";
+ public final static String ID = "$Revision: 1.97 $ $Date: 2004/12/01 19:27:27 $";
public final static String VERSION = "0.4.2.2";
- public final static long BUILD = 0;
+ public final static long BUILD = 1;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION);
System.out.println("Router ID: " + RouterVersion.ID);
--
GitLab