1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java b/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java
index 0101e340..9a8dd0a8 100644
--- a/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java
+++ b/src/main/java/com/juick/xmpp/s2s/ConnectionOut.java
@@ -110,7 +110,7 @@ public class ConnectionOut extends Connection implements Runnable {
                         }
 
                         LOGGER.warning("STREAM TO " + to + " " + streamID + " FINISHED");
-                        XMPPComponent.removeConnectionOut(this);
+                        XMPPComponent.removeConnectionOut(ConnectionOut.this);
                         closeConnection();
                     } catch (XmlPullParserException e) {
                         e.printStackTrace();
@@ -126,8 +126,7 @@ public class ConnectionOut extends Connection implements Runnable {
 
                 }
             });
-
-
+            Thread.currentThread().join();
         } catch (Exception e) {
             LOGGER.warning(e.toString());
             XMPPComponent.removeConnectionOut(this);