Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-09-09 10:19:41 +02:00
Code Issues Releases Wiki Activity

Merge branch '4.1'

Browse source 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
	smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
	version.gradle
This commit is contained in:
Florian Schmaus 2015-03-24 17:16:18 +01:00
commit 83b84c5bd3
168 changed files with 780 additions and 687 deletions
Download patch file Download diff file Expand all files Collapse all files

8
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
View file

@ -600,7 +600,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
}
/**
* Initializes the connection by creating a packet reader and writer and opening a
* Initializes the connection by creating a stanza(/packet) reader and writer and opening a
* XMPP stream to the server.
*
* @throws XMPPException if establishing a connection to the server fails.
@ -954,7 +954,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
}
/**
* Shuts the packet reader down. This method simply sets the 'done' flag to true.
* Shuts the stanza(/packet) reader down. This method simply sets the 'done' flag to true.
*/
void shutdown() {
done = true;
@ -1175,7 +1175,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
XMPPTCPConnection.this);
/**
* If set, the packet writer is shut down
* If set, the stanza(/packet) writer is shut down
*/
protected volatile Long shutdownTimestamp = null;
@ -1250,7 +1250,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
}
/**
* Shuts down the packet writer. Once this method has been called, no further
* Shuts down the stanza(/packet) writer. Once this method has been called, no further
* packets will be written to the server.
*/
void shutdown(boolean instant) {

2
smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java
View file

@ -34,7 +34,7 @@ public class PacketWriterTest {
volatile boolean prematureUnblocked;
/**
* Make sure that packet writer does block once the queue reaches
* Make sure that stanza(/packet) writer does block once the queue reaches
* {@link PacketWriter#QUEUE_SIZE} and that
* {@link PacketWriter#sendStanza(org.jivesoftware.smack.tcp.packet.Packet)} does unblock after the
* interrupt.