You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by tb...@apache.org on 2013/12/06 17:53:10 UTC

[28/50] [abbrv] git commit: [OLINGO-73] use getElementText where possible

[OLINGO-73] use getElementText where possible

next() in combination with getText() might not deliver all character data.
Thus we have to check for the characters event again or use
getElementText(). For the metadata consumer a bugfix regarding annotations
is still missing.


Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/8be1f9b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/8be1f9b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/8be1f9b7

Branch: refs/heads/ODataServlet
Commit: 8be1f9b79370f492682b32b043050a2ea19f2141
Parents: d1e85e9
Author: Christian Amend <ch...@apache.org>
Authored: Mon Dec 2 17:34:05 2013 +0100
Committer: Tamara Boehm <ta...@sap.com>
Committed: Fri Dec 6 17:51:36 2013 +0100

----------------------------------------------------------------------
 .../apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8be1f9b7/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
index 5cd1258..02562fb 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
@@ -117,7 +117,10 @@ public class XmlFeedConsumer {
           } catch (NumberFormatException e) {
             throw new EntityProviderException(EntityProviderException.INLINECOUNT_INVALID.addContent(""), e);
           }
+        } catch (NumberFormatException e) {
+          throw new EntityProviderException(EntityProviderException.INLINECOUNT_INVALID.addContent(""), e);
         }
+
       } else if (FormatXml.ATOM_LINK.equals(reader.getLocalName())) {
         reader.require(XMLStreamConstants.START_ELEMENT, Edm.NAMESPACE_ATOM_2005, FormatXml.ATOM_LINK);