diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java index 0c63b4cf7..da72a710d 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java @@ -33,7 +33,7 @@ class PeerConnectionIn implements Runnable private final DataInputStream din; private Thread thread; - private boolean quit; + private volatile boolean quit; public PeerConnectionIn(Peer peer, DataInputStream din) { @@ -51,6 +51,13 @@ class PeerConnectionIn implements Runnable Thread t = thread; if (t != null) t.interrupt(); + if (din != null) { + try { + din.close(); + } catch (IOException ioe) { + _log.warn("Error closing the stream from " + peer, ioe); + } + } } public void run() diff --git a/history.txt b/history.txt index 54ce7502a..bde5010c2 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,7 @@ -$Id: history.txt,v 1.543 2007-01-20 22:35:49 complication Exp $ +$Id: history.txt,v 1.544 2007-01-20 22:49:41 complication Exp $ + +2007-01-27 zzz + * i2psnark: Fix orphaned Snark reader tasks leading to OOMs 2007-01-20 Complication * Drop overlooked comment diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f735bd483..133a093ce 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.479 $ $Date: 2007-01-20 22:35:50 $"; + public final static String ID = "$Revision: 1.480 $ $Date: 2007-01-20 22:49:41 $"; public final static String VERSION = "0.6.1.26"; - public final static long BUILD = 13; + public final static long BUILD = 14; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("Router ID: " + RouterVersion.ID);