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

Merge branch '4.1'

Browse source 
Conflicts:
	version.gradle
This commit is contained in:
Florian Schmaus 2015-03-11 20:51:08 +01:00
commit 369878b6d9
8 changed files with 48 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -517,6 +517,9 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
disconnectedButResumeable = true;
} else {
disconnectedButResumeable = false;
// Reset the stream management session id to null, since if the stream is cleanly closed, i.e. sending a closing
// stream tag, there is no longer a stream to resume.
smSessionId = null;
}
authenticated = false;
connected = false;
@ -524,9 +527,6 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
reader = null;
writer = null;
// Reset the stream management session id to null, since if the stream is cleanly closed, i.e. sending a closing
// stream tag, there is no longer a stream to resume.
smSessionId = null;
maybeCompressFeaturesReceived.init();
compressSyncPoint.init();
smResumedSyncPoint.init();