vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-22 03:52:06 +01:00
Code Issues Releases Wiki Activity

Merge branch '4.0'

Browse source 
Conflicts:
	build.gradle
	smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java
This commit is contained in:
Florian Schmaus 2014-10-22 22:20:26 +02:00
commit 177ab983d4
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -334,4 +334,4 @@ def getAndroidHome() {
def androidHome = new File(androidHomeEnv)
if (!androidHome.isDirectory()) throw new Exception("Environment variable ANDROID_HOME is not pointing to a directory")
return androidHome
}
}

11
resources/releasedocs/changelog.html
View file

@ -141,6 +141,17 @@ hr {
<div id="pageBody">
<h2>4.0.5 -- <span style="font-weight: normal;">2014-10-22</span></h2>
<h2> Bug
</h2>
<ul>
<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-609'>SMACK-609</a>] - PingManager.ping(String, long) does not respect timeout
</li>
<li>[<a href='https://igniterealtime.org/issues/browse/SMACK-613'>SMACK-613</a>] - Parsing exception causes infinite loop if the exception is not thrown
</li>
</ul>
<h2>4.0.4 -- <span style="font-weight: normal;">2014-09-05</span></h2>
<h2> Bug

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

@ -1032,6 +1032,10 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
if (callback != null) {
callback.handleUnparsablePacket(message);
}
// The parser is now at the end tag of the unparsable stanza. We need to advance to the next
// start tag in order to avoid an exception which would again lead to the execution of the
// catch block becoming effectively an endless loop.
eventType = parser.next();
continue;
} finally {
clientHandledStanzasCount = SMUtils.incrementHeight(clientHandledStanzasCount);