1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 09:09:38 +02:00

Merge branch '4.2'

This commit is contained in:
Florian Schmaus 2018-02-10 12:14:09 +01:00
commit 5333bde2e8
2 changed files with 22 additions and 10 deletions

View file

@ -638,9 +638,9 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
packetWriter = new PacketWriter();
packetReader = new PacketReader();
}
// Start the packet writer. This will open an XMPP stream to the server
// Start the writer thread. This will open an XMPP stream to the server
packetWriter.init();
// Start the packet reader. The startup() method will block until we
// Start the reader thread. The startup() method will block until we
// get an opening stream packet back from server
packetReader.init();
}
@ -1001,7 +1001,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
public void run() {
parsePackets();
}
}, "Smack Packet Reader (" + getConnectionCounter() + ")");
}, "Smack Reader (" + getConnectionCounter() + ")");
}
/**
@ -1297,7 +1297,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
public void run() {
writePackets();
}
}, "Smack Packet Writer (" + getConnectionCounter() + ")");
}, "Smack Writer (" + getConnectionCounter() + ")");
}
private boolean done() {
@ -1375,7 +1375,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
catch (InterruptedException e) {
if (!queue.isShutdown()) {
// Users shouldn't try to interrupt the packet writer thread
LOGGER.log(Level.WARNING, "Packet writer thread was interrupted. Don't do that. Use disconnect() instead.", e);
LOGGER.log(Level.WARNING, "Writer thread was interrupted. Don't do that. Use disconnect() instead.", e);
}
}
return packet;