marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

2004-12-01 jrandom

Browse Source 
* Fix for a race in the streaming lib as caused by some odd SAM activity
This commit is contained in:
jrandom
2004-12-02 03:20:03 +00:00
committed by zzz
parent 97e8ab7c5b
commit 8abd99d134
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java
View File

@ -78,14 +78,12 @@ public class PacketLocal extends Packet implements MessageOutputStream.WriteStat
_ackOn = _context.clock().now(); _ackOn = _context.clock().now();
notifyAll(); notifyAll();
} }
_connection = null;
} }
public void cancelled() { public void cancelled() {
synchronized (this) { synchronized (this) {
_cancelledOn = _context.clock().now(); _cancelledOn = _context.clock().now();
notifyAll(); notifyAll();
} }
_connection = null;
} }
/** how long after packet creation was it acked? */ /** how long after packet creation was it acked? */
@ -116,11 +114,9 @@ public class PacketLocal extends Packet implements MessageOutputStream.WriteStat
_acceptedOn = _context.clock().now(); _acceptedOn = _context.clock().now();
else else
_acceptedOn = -1; _acceptedOn = -1;
_connection = null;
} }
public void waitForCompletion(int maxWaitMs) { public void waitForCompletion(int maxWaitMs) {
_connection = null;
long expiration = _context.clock().now()+maxWaitMs; long expiration = _context.clock().now()+maxWaitMs;
while (true) { while (true) {
long timeRemaining = expiration - _context.clock().now(); long timeRemaining = expiration - _context.clock().now();

5
history.txt
View File

@ -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 * 2004-12-01 0.4.2.2 released

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
* *
*/ */
public class RouterVersion { 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 String VERSION = "0.4.2.2";
public final static long BUILD = 0; public final static long BUILD = 1;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION); System.out.println("I2P Router version: " + VERSION);
System.out.println("Router ID: " + RouterVersion.ID); System.out.println("Router ID: " + RouterVersion.ID);