From b1e4884fbbaebf12ec8448a9065bf5e73962b6f1 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Mon, 24 Aug 2015 09:32:28 +0200 Subject: [PATCH] Remove erroneous next() from AbstractJsonExtensionProvider Fixes SMACK-695. --- .../java/org/jivesoftware/smack/util/PacketParserUtils.java | 3 ++- .../smackx/json/provider/AbstractJsonExtensionProvider.java | 3 +-- 2 files changed, 3 insertions(+), 3 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 0dc960583..a2e965777 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 @@ -301,7 +301,8 @@ public class PacketParserUtils { } /** - * Returns the textual content of an element as String. + * Returns the textual content of an element as String. After this method returns the parser + * position will be END_TAG, following the established pull parser calling convention. *

* The parser must be positioned on a START_TAG of an element which MUST NOT contain Mixed * Content (as defined in XML 3.2.2), or else an XmlPullParserException will be thrown. diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/json/provider/AbstractJsonExtensionProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/json/provider/AbstractJsonExtensionProvider.java index 821557017..ab96a7d0b 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/json/provider/AbstractJsonExtensionProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/json/provider/AbstractJsonExtensionProvider.java @@ -1,6 +1,6 @@ /** * - * Copyright © 2014 Florian Schmaus + * Copyright © 2014-2015 Florian Schmaus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,6 @@ public abstract class AbstractJsonExtensionProvider extends ExtensionElementProv public AbstractJsonPacketExtension parse(XmlPullParser parser, int initialDepth) throws XmlPullParserException, IOException, SmackException { String json = PacketParserUtils.parseElementText(parser); - parser.next(); return from(json); }