From 889b5ae280087c0cfd74bd069e7bf40fff158b97 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 16 Jan 2018 00:26:32 +0000
Subject: [PATCH] i2ptunnel: Fix NPE stopping TCG
---
.../java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
index fa9d267367..dab5522145 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
@@ -881,8 +881,11 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
@Override
public synchronized boolean destroy() {
close(true);
- if (_ownDest)
- sockMgr.destroySocketManager();
+ if (_ownDest) {
+ I2PSocketManager sm = sockMgr;
+ if (sm != null)
+ sm.destroySocketManager();
+ }
return true;
}
--
GitLab