vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-16 00:24:49 +02:00
Code Issues Releases Wiki Activity

Merge branch '4.0'

Browse source
This commit is contained in:
Florian Schmaus 2014-08-20 15:29:29 +02:00
parent aa14f55902 1e5f0eb749
commit 47ffcd8b6d
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
View file

@ -262,9 +262,18 @@ public class PacketParserUtils {
// Advance to the text of the Element // Advance to the text of the Element
int event = parser.next(); int event = parser.next();
if (event != XmlPullParser.TEXT) { if (event != XmlPullParser.TEXT) {
if (event == XmlPullParser.END_TAG) {
// Assume this is the end tag of the start tag at the
// beginning of this method. Typical examples where this
// happens are body elements containing the empty string,
// ie. <body></body>, which appears to be valid XMPP, or a
// least it's not explicitly forbidden by RFC 6121 5.2.3
return "";
} else {
throw new XmlPullParserException( throw new XmlPullParserException(
"Non-empty element tag not followed by text, while Mixed Content (XML 3.2.2) is disallowed"); "Non-empty element tag not followed by text, while Mixed Content (XML 3.2.2) is disallowed");
} }
}
res = parser.getText(); res = parser.getText();
event = parser.next(); event = parser.next();
if (event != XmlPullParser.END_TAG) { if (event != XmlPullParser.END_TAG) {