aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-02-01 19:10:42 +0300
committerGravatar Vitaly Takmazov2016-02-01 19:10:42 +0300
commit14c5ddd69a6f76a96d7eb98afb01caac79308553 (patch)
treefa2c7b81757a06fddafcdbdd0e67261b29fdb6df /src
parentc907c80a1bfe86a3c0b40b48d65a244e8b987368 (diff)
fix connectionout, part 2
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/juick/xmpp/s2s/ConnectionOut.java5
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);