Merge branch 'master' of https://github.com/DMDirc/Parser

irc/src/main/java/com/dmdirc/parser/irc/IRCParser.java

      * wrapped, and should therefore not be used to send or receive data.
      */
     private Socket rawSocket;
+    /** The socket connected to the IRC server, used for sending or receiving data. */
+    private Socket socket;
     /** Used for writing to the server. */
     private OutputQueue out;
     /** The encoder to use to encode incoming lines. */
      *
      * @param queue The queue to be added.
      */
-    public void setOutputQueue(final OutputQueue queue) {
+    public void setOutputQueue(final OutputQueue queue) throws IOException {
         checkNotNull(queue);
         out.clearQueue();
+
+        if (socket != null) {
+            queue.setOutputStream(socket.getOutputStream());
+        }
+
         out = queue;
     }
 
 
         rawSocket = getSocketFactory().createSocket(connectUri.getHost(), connectUri.getPort());
 
-        final Socket mySocket;
         if (getURI().getScheme().endsWith("s")) {
             callDebugInfo(DEBUG_SOCKET, "Server is SSL.");
 
             sc.init(myKeyManagers, myTrustManager, new SecureRandom());
 
             final SSLSocketFactory socketFactory = sc.getSocketFactory();
-            mySocket = socketFactory.createSocket(rawSocket, getURI().getHost(), getURI()
+            socket = socketFactory.createSocket(rawSocket, getURI().getHost(), getURI()
                     .getPort(), false);
 
             // Manually start a handshake so we get proper SSL errors here,
             // and so that we can control the connection timeout
-            final int timeout = mySocket.getSoTimeout();
-            mySocket.setSoTimeout(10000);
-            ((SSLSocket) mySocket).startHandshake();
-            mySocket.setSoTimeout(timeout);
+            final int timeout = socket.getSoTimeout();
+            socket.setSoTimeout(10000);
+            ((SSLSocket) socket).startHandshake();
+            socket.setSoTimeout(timeout);
 
             currentSocketState = SocketState.OPENING;
         } else {
-            mySocket = rawSocket;
+            socket = rawSocket;
         }
 
         callDebugInfo(DEBUG_SOCKET, "\t-> Opening socket output stream PrintWriter");
-        out.setOutputStream(mySocket.getOutputStream());
+        out.setOutputStream(socket.getOutputStream());
         out.setQueueEnabled(true);
         currentSocketState = SocketState.OPEN;
         callDebugInfo(DEBUG_SOCKET, "\t-> Opening socket input stream BufferedReader");
-        in = new IRCReader(mySocket.getInputStream(), encoder);
+        in = new IRCReader(socket.getInputStream(), encoder);
         callDebugInfo(DEBUG_SOCKET, "\t-> Socket Opened");
     }
 

irc/src/main/java/com/dmdirc/parser/irc/processors/ProcessJoin.java

         } else {
             // Some kind of failed to join, pop the pending join queues.
             final PendingJoin pendingJoin = pendingJoins.poll();
-            callDebugInfo(IRCParser.DEBUG_INFO, "processJoin: Failed to join channel (" + sParam + ") - Skipping " + pendingJoin.getChannel() + " (" + pendingJoin.getKey() + ")");
+            if (pendingJoin != null && parser.getStringConverter().equalsIgnoreCase(pendingJoin.getChannel(), sParam)) {
+                callDebugInfo(IRCParser.DEBUG_INFO, "processJoin: Failed to join channel (" + sParam + ") - Skipping " + pendingJoin.getChannel() + " (" + pendingJoin.getKey() + ")");
+            } else {
+                // Out of sync, clear
+                callDebugInfo(IRCParser.DEBUG_INFO, "processJoin: Failed to join channel (" + sParam + ") - pending join keys out of sync (Got: " + (pendingJoin == null ? pendingJoin : pendingJoin.getChannel()) + ", Wanted: " + sParam + ") - Clearing.");
+                pendingJoins.clear();
+            }
         }
     }