Fix deadlock when reconnecting

Fixes issue 3704

Change-Id: I10590167a97e86d3abb21addbf3880d7e2dc97ac
Reviewed-on: http://gerrit.dmdirc.com/789
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/Server.java

@@ -135,12 +135,12 @@ public class Server extends WritableFrameContainer implements
     /** The profile we're using. */
     private transient Identity profile;
 
-    /** The current state of this server. */
-    private final ServerStatus myState = new ServerStatus(this);
-
-    /** Object used to synchronoise access to myState. */
+    /** Object used to synchronise access to myState. */
     private final Object myStateLock = new Object();
 
+    /** The current state of this server. */
+    private final ServerStatus myState = new ServerStatus(this, myStateLock);
+
     /** The timer we're using to delay reconnects. */
     private Timer reconnectTimer;
 
@@ -262,9 +262,7 @@ public class Server extends WritableFrameContainer implements
                 case DISCONNECTING:
                     while (!myState.getState().isDisconnected()) {
                         try {
-                            synchronized (myState) {
-                                myState.wait();
-                            }
+                            myStateLock.wait();
                         } catch (InterruptedException ex) {
                             return;
                         }

src/com/dmdirc/ServerStatus.java

@@ -39,6 +39,9 @@ public class ServerStatus {
     /** The server to which this status belongs. */
     protected final Server server;
 
+    /** Object to notify when the state of the server changes. */
+    protected final Object notifier;
+
     /** The current state of the server. */
     protected ServerState state = ServerState.DISCONNECTED;
 
@@ -52,10 +55,12 @@ public class ServerStatus {
      * Creates a new ServerStatus instance for the specified server.
      *
      * @param server The server to which this status belongs
-     * @since 0.6.3m2
+     * @param notifier The object to notify when the state changes
+     * @since 0.6.3
      */
-    public ServerStatus(final Server server) {
+    public ServerStatus(final Server server, final Object notifier) {
         this.server = server;
+        this.notifier = notifier;
     }
 
     /**
@@ -69,8 +74,8 @@ public class ServerStatus {
         if (state.canTransitionTo(newState)) {
             state = newState;
 
-            synchronized (this) {
-                notifyAll();
+            synchronized (notifier) {
+                notifier.notifyAll();
             }
         } else {
             throw new IllegalArgumentException("Illegal server state "