From 3d40b3bf29c05a036fb84e521d42481dd1596861 Mon Sep 17 00:00:00 2001
From: chimp1984 <chimp1984@gmx.com>
Date: Tue, 7 Dec 2021 21:07:40 -0500
Subject: [PATCH] Add null checks Return early at connection if stopped Cleanup
 logs

---
 common/src/main/java/bisq/common/ClockWatcher.java            | 4 +++-
 core/src/main/java/bisq/core/app/BisqExecutable.java          | 2 +-
 p2p/src/main/java/bisq/network/p2p/network/Connection.java    | 3 +++
 .../main/java/bisq/network/p2p/network/TorNetworkNode.java    | 1 -
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/bisq/common/ClockWatcher.java b/common/src/main/java/bisq/common/ClockWatcher.java
index 36c54cbc0b0..f4deb90f474 100644
--- a/common/src/main/java/bisq/common/ClockWatcher.java
+++ b/common/src/main/java/bisq/common/ClockWatcher.java
@@ -80,7 +80,9 @@ public void start() {
     }
 
     public void shutDown() {
-        timer.stop();
+        if (timer != null) {
+            timer.stop();
+        }
         timer = null;
         counter = 0;
     }
diff --git a/core/src/main/java/bisq/core/app/BisqExecutable.java b/core/src/main/java/bisq/core/app/BisqExecutable.java
index 04dfad0b491..e861d15b516 100644
--- a/core/src/main/java/bisq/core/app/BisqExecutable.java
+++ b/core/src/main/java/bisq/core/app/BisqExecutable.java
@@ -286,7 +286,7 @@ private void flushAndExit(ResultHandler resultHandler, int status) {
             // If user tried to downgrade we do not write the persistable data to avoid data corruption
             log.info("PersistenceManager flushAllDataToDiskAtShutdown started");
             PersistenceManager.flushAllDataToDiskAtShutdown(() -> {
-                log.info("Graceful shutdown resulted in an error. Exiting now.");
+                log.info("Graceful shutdown completed. Exiting now.");
                 resultHandler.handleResult();
                 UserThread.runAfter(() -> System.exit(status), 100, TimeUnit.MILLISECONDS);
             });
diff --git a/p2p/src/main/java/bisq/network/p2p/network/Connection.java b/p2p/src/main/java/bisq/network/p2p/network/Connection.java
index c28aafa9458..49a3318d291 100644
--- a/p2p/src/main/java/bisq/network/p2p/network/Connection.java
+++ b/p2p/src/main/java/bisq/network/p2p/network/Connection.java
@@ -727,6 +727,9 @@ public void run() {
                     }
 
                     if (proto == null) {
+                        if (stopped) {
+                            return;
+                        }
                         if (protoInputStream.read() == -1) {
                             log.warn("proto is null because protoInputStream.read()=-1 (EOF). That is expected if client got stopped without proper shutdown.");
                         } else {
diff --git a/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java b/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
index 9bfbc6e0211..c161411c018 100644
--- a/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
+++ b/p2p/src/main/java/bisq/network/p2p/network/TorNetworkNode.java
@@ -156,7 +156,6 @@ public void shutDown(@Nullable Runnable shutDownCompleteHandler) {
             try {
                 tor = Tor.getDefault();
                 if (tor != null) {
-                    log.info("Tor has been created already so we can shut it down.");
                     tor.shutdown();
                     tor = null;
                     log.info("Tor shutdown completed");