Merge pull request #4974 from chimp1984/fix-nullpointer

[1.5.2] Fix nullpointer
bisq-network · Dec 19, 2020 · c8c6633 · c8c6633
2 parents 245e736 + d24d05d
commit c8c6633
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java b/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
@@ -184,7 +184,9 @@ private BooleanProperty torNetworkNodeShutDown() {
                 log.info("Tor shut down completed");
             } else {
                 log.info("Tor has not been created yet. We cancel the torStartupFuture.");
-                torStartupFuture.cancel(true);
+                if (torStartupFuture != null) {
+                    torStartupFuture.cancel(true);
+                }
                 log.info("torStartupFuture cancelled");
             }
         } catch (Throwable e) {