* NTCP: Fix startup race NPE

i2p · Jun 9, 2009 · a08dd4a · a08dd4a
1 parent be52b59
commit a08dd4a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/history.txt b/history.txt
@@ -1,3 +1,6 @@
+2009-06-09 zzz
+    * NTCP: Fix startup race NPE (thanks postman!)
+
 2009-06-08 sponge
     * Last commit for this cycle. All debugging except for WARN removed.
       I can use the visit command to debug now anyway.

diff --git 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 = "-rc";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;

diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPSendFinisher.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPSendFinisher.java
@@ -42,7 +42,8 @@ public void start() {
     }
 
     public void stop() {
-        _executor.shutdownNow();
+        if (_executor != null)
+            _executor.shutdownNow();
     }
 
     public void add(OutNetMessage msg) {