From 51378aebee00e764c1631754a4d33c41fe970f31 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Tue, 24 Jan 2017 22:46:40 +0100
Subject: [PATCH] Revert "Throw exception if stanza child contains text"

This reverts commit eb9242768cf5e3d9007f0485b972bb62a084e535.

Turns out, that there is in fact not such restriction in the
RFCs (only for <subject/>, <body/> and the a few others).
---
 .../java/org/jivesoftware/smack/util/PacketParserUtils.java | 6 ------
 .../org/jivesoftware/smack/util/PacketParserUtilsTest.java  | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
index f702052fd..4c9ce0699 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
@@ -290,8 +290,6 @@ public class PacketParserUtils {
                     break outerloop;
                 }
                 break;
-            case XmlPullParser.TEXT:
-                throw new IllegalStateException("Invalid Stanza: Must not contain text or mixed content as direct child of <message/>");
             }
         }
 
@@ -592,8 +590,6 @@ public class PacketParserUtils {
                     break outerloop;
                 }
                 break;
-            case XmlPullParser.TEXT:
-                throw new IllegalStateException("Invalid Stanza: Must not contain text or mixed content as direct child of <presence/>");
             }
         }
         return presence;
@@ -650,8 +646,6 @@ public class PacketParserUtils {
                     break outerloop;
                 }
                 break;
-            case XmlPullParser.TEXT:
-                throw new IllegalStateException("Invalid Stanza: Must not contain text or mixed content as direct child of <iq/>");
             }
         }
         // Decide what to do when an IQ packet was not understood
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
index e24196d15..117e9e3c1 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java
@@ -710,8 +710,8 @@ public class PacketParserUtilsTest {
         try {
             PacketParserUtils.parseMessage(PacketParserUtils.getParserFor(invalidControl));
             fail("Exception should be thrown");
-        } catch(IllegalStateException e) {
-            assertTrue(e.getMessage().contains("Invalid Stanza"));
+        } catch(XmlPullParserException e) {
+            assertTrue(e.getMessage().contains("end tag name </body>"));
         }
 
         invalidControl = validControl.replace("Good Message Body", "Bad </message> Body");