Merge branch '4.0'

Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
This commit is contained in:
Florian Schmaus 2014-07-16 10:52:58 +02:00
commit 1ed5c48bcc
1 changed files with 6 additions and 1 deletions

View File

@ -168,7 +168,12 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
protected XMPPInputOutputStream compressionHandler;
private final ScheduledExecutorService executorService = new ScheduledThreadPoolExecutor(2,
/**
* ExecutorService used to invoke the PacketListeners on newly arrived and parsed stanzas. It is
* important that we use a <b>single threaded ExecutorService</b> in order to guarantee that the
* PacketListeners are invoked in the same order the stanzas arrived.
*/
private final ScheduledExecutorService executorService = new ScheduledThreadPoolExecutor(1,
new SmackExecutorThreadFactory(connectionCounterValue));
/**