Hopefully fix a ConcurrentModificationException

MCMrARM · Dec 3, 2017 · fd14ef5 · fd14ef5
1 parent a7f1a7a
commit fd14ef5
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/chatlib/src/main/java/io/mrarm/chatlib/irc/IRCConnection.java b/chatlib/src/main/java/io/mrarm/chatlib/irc/IRCConnection.java
@@ -117,16 +117,18 @@ private void handleInput() {
             }
         } catch (IOException e) {
             e.printStackTrace();
+            socketInputStream = null;
             synchronized (socketOutputStream) {
-                socket = null;
-                socketInputStream = null;
                 socketOutputStream = null;
             }
-            if (connectErrorCallback != null)
-                connectErrorCallback.onError(e);
             getServerConnectionData().addLocalMessageToAllChannels(new MessageInfo(null, new Date(), null, MessageInfo.MessageType.DISCONNECT_WARNING));
             getServerConnectionData().getServerStatusData().addMessage(new StatusMessageInfo(null, new Date(), StatusMessageInfo.MessageType.DISCONNECT_WARNING, null));
             getServerConnectionData().getCommandHandlerList().notifyDisconnected();
+            synchronized (this) {
+                socket = null;
+                if (connectErrorCallback != null)
+                    connectErrorCallback.onError(e);
+            }
             synchronized (disconnectListeners) {
                 for (DisconnectListener listener : disconnectListeners) {
                     listener.onDisconnected(this, e);