Search for the connection before removing it.

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index ca91805..f7b0595 100644 (file)
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -569,8 +569,8 @@ public class Core extends AbstractExecutionThreadService {
         */
        @Subscribe
        public void connectionClosed(ConnectionClosed connectionClosed) {
         */
        @Subscribe
        public void connectionClosed(ConnectionClosed connectionClosed) {

-               removeConnection(connectionClosed.connection());

                connectionBackoff.connectionFailed(getNetwork(connectionClosed.connection()).get());
                connectionBackoff.connectionFailed(getNetwork(connectionClosed.connection()).get());

+               removeConnection(connectionClosed.connection());

                eventBus.post(new GenericMessage(String.format("Connection closed by %s.", connectionClosed.connection().hostname())));
        }
 
                eventBus.post(new GenericMessage(String.format("Connection closed by %s.", connectionClosed.connection().hostname())));
        }
 


@@ -582,8 +582,8 @@ public class Core extends AbstractExecutionThreadService {
         */
        @Subscribe
        public void connectionFailed(ConnectionFailed connectionFailed) {
         */
        @Subscribe
        public void connectionFailed(ConnectionFailed connectionFailed) {

-               removeConnection(connectionFailed.connection());

                connectionBackoff.connectionFailed(getNetwork(connectionFailed.connection()).get());
                connectionBackoff.connectionFailed(getNetwork(connectionFailed.connection()).get());

+               removeConnection(connectionFailed.connection());

                eventBus.post(new GenericMessage(String.format("Could not connect to %s: %s.", connectionFailed.connection().hostname(), connectionFailed.cause())));
        }
 
                eventBus.post(new GenericMessage(String.format("Could not connect to %s: %s.", connectionFailed.connection().hostname(), connectionFailed.cause())));
        }