diff --git a/history.txt b/history.txt index 7d63b6611..a056e016c 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2018-06-13 zzz + * NTCP: Fix clearing of write interest ops on + inbound establishment (ticket #2237) + 2018-06-09 zzz * eepsite: Fix up help page in prep for translation (ticket #2214) * i2psnark: Fix torrent ignoring priority settings when diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 80cfb9c84..5b1ba79e3 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 18; + public final static long BUILD = 19; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java index cd8a61f02..fd098a390 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java @@ -679,7 +679,7 @@ public class NTCPConnection implements Closeable { * as it occurs in the selector thread) */ public void outboundConnected() { - _conKey.interestOps(SelectionKey.OP_READ); + _conKey.interestOps(_conKey.interestOps() | SelectionKey.OP_READ); // schedule up the beginning of our handshaking by calling prepareNextWrite on the // writer thread pool _transport.getWriter().wantsWrite(this, "outbound connected");