From 9821dd62719ea354c3d52edff8c4d57568d946d4 Mon Sep 17 00:00:00 2001
From: chimp1984 <chimp1984@gmx.com>
Date: Wed, 7 Oct 2020 13:03:18 -0500
Subject: [PATCH] Clear capabilitiesListeners at shutdown Improve logs

---
 .../bisq/network/p2p/network/Connection.java  | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

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 8b3560e336..7789d0422b 100644
--- a/p2p/src/main/java/bisq/network/p2p/network/Connection.java
+++ b/p2p/src/main/java/bisq/network/p2p/network/Connection.java
@@ -159,6 +159,8 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
     private final List<Long> messageTimeStamps = new ArrayList<>();
     private final CopyOnWriteArraySet<MessageListener> messageListeners = new CopyOnWriteArraySet<>();
     private volatile long lastSendTimeStamp = 0;
+    // We use a weak reference here to ensure that no connection causes a memory leak in case it get closed without
+    // the shutDown being called.
     private final CopyOnWriteArraySet<WeakReference<SupportedCapabilitiesListener>> capabilitiesListeners = new CopyOnWriteArraySet<>();
 
     @Getter
@@ -514,6 +516,8 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
         } finally {
             protoOutputStream.onConnectionShutdown();
 
+            capabilitiesListeners.clear();
+
             try {
                 protoInputStream.close();
             } catch (IOException e) {
@@ -559,7 +563,6 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
                 '}';
     }
 
-    @SuppressWarnings("unused")
     public String printDetails() {
         String portInfo;
         if (socket.getLocalPort() == 0)
@@ -783,19 +786,26 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
                     }
 
                     if (networkEnvelope instanceof SupportedCapabilitiesMessage) {
-                        Capabilities supportedCapabilities = ((SupportedCapabilitiesMessage) networkEnvelope).getSupportedCapabilities();
-                        if (supportedCapabilities != null) {
-                            if (!capabilities.equals(supportedCapabilities)) {
-                                capabilities.set(supportedCapabilities);
+                        Capabilities capabilities = ((SupportedCapabilitiesMessage) networkEnvelope).getSupportedCapabilities();
+                        if (capabilities != null) {
+                            if (!this.capabilities.equals(capabilities)) {
+                                this.capabilities.set(capabilities);
 
                                 // Capabilities can be empty. We only check for mandatory if we get some capabilities.
-                                if (!capabilities.isEmpty() && !Capabilities.hasMandatoryCapability(capabilities)) {
-                                    String senderNodeAddress = networkEnvelope instanceof SendersNodeAddressMessage ?
-                                            ((SendersNodeAddressMessage) networkEnvelope).getSenderNodeAddress().getFullAddress() :
-                                            "[unknown address]";
-                                    log.info("We close a connection to old node {}. " +
-                                                    "Capabilities of old node: {}, networkEnvelope class name={}",
-                                            senderNodeAddress, capabilities.prettyPrint(), networkEnvelope.getClass().getSimpleName());
+                                if (!this.capabilities.isEmpty() && !Capabilities.hasMandatoryCapability(this.capabilities)) {
+                                    String senderNodeAddress = getPeersNodeAddressOptional().isPresent() ?
+                                            getPeersNodeAddressOptional().get().getFullAddress() :
+                                            networkEnvelope instanceof SendersNodeAddressMessage ?
+                                                    ((SendersNodeAddressMessage) networkEnvelope).getSenderNodeAddress().getFullAddress() :
+                                                    "[unknown address]";
+
+                                    log.info("We close a connection because of " +
+                                                    "CloseConnectionReason.MANDATORY_CAPABILITIES_NOT_SUPPORTED " +
+                                                    "to node {}. Capabilities of old node: {}, " +
+                                                    "networkEnvelope class name={}",
+                                            senderNodeAddress,
+                                            this.capabilities.prettyPrint(),
+                                            networkEnvelope.getClass().getSimpleName());
                                     shutDown(CloseConnectionReason.MANDATORY_CAPABILITIES_NOT_SUPPORTED);
                                     return;
                                 }
@@ -803,7 +813,7 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
                                 capabilitiesListeners.forEach(weakListener -> {
                                     SupportedCapabilitiesListener supportedCapabilitiesListener = weakListener.get();
                                     if (supportedCapabilitiesListener != null) {
-                                        UserThread.execute(() -> supportedCapabilitiesListener.onChanged(supportedCapabilities));
+                                        UserThread.execute(() -> supportedCapabilitiesListener.onChanged(capabilities));
                                     }
                                 });
                             }