NTCP: Remove closed connections from write queue (ticket #2686)

history.txt

@@ -1,3 +1,20 @@
+2020-02-15 zzz
+ * NTCP: Remove closed connections from write queue (ticket #2686)
+
+2020-02-12 zzz
+ * I2CP: Place ECIES first in LS2
+ * i2ptunnel: Change default sig type to Ed for non-shared HTTP client
+
+2020-02-10 zzz
+ * Transport: Mark yggdrasil IPv6 prefix as not routable
+
+2020-02-09 zzz
+ * Console: Show local tunnel status as green if any leases are valid
+ * I2CP: I2CPMessageHandlerMap cleanup
+
+2020-02-05 zzz
+ * SSU: Skip down interfaces when looking for MTU
+
 2020-02-03 zzz
  * Graphs: Clean up font setting, fix bugs (ticket #2684)
 

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 = 7;
+    public final static long BUILD = 8;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";

router/java/src/net/i2p/router/transport/ntcp/EventPumper.java

@@ -819,10 +819,12 @@ class EventPumper implements Runnable {
         if (!_wantsWrite.isEmpty()) {
             for (Iterator<NTCPConnection> iter = _wantsWrite.iterator(); iter.hasNext(); ) {
                 con = iter.next();
+                iter.remove();
+                if (con.isClosed())
+                    continue;
                 SelectionKey key = con.getKey();
                 if (key == null)
                     continue;
-                iter.remove();
                 try {
                     key.interestOps(key.interestOps() | SelectionKey.OP_WRITE);
                 } catch (CancelledKeyException cke) {