You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by rm...@apache.org on 2015/01/05 11:51:06 UTC

incubator-johnzon git commit: JOHNZON-32 handling EOF

Repository: incubator-johnzon
Updated Branches:
  refs/heads/master 0048dd1db -> e22050645


JOHNZON-32 handling EOF


Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/e2205064
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/e2205064
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/e2205064

Branch: refs/heads/master
Commit: e2205064528b540268c807ff8dbe2bee5150f0e0
Parents: 0048dd1
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Jan 5 11:50:35 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Jan 5 11:50:44 2015 +0100

----------------------------------------------------------------------
 .../org/apache/johnzon/core/CommentsJsonStreamParserImpl.java     | 1 +
 .../main/java/org/apache/johnzon/core/JsonStreamParserImpl.java   | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/e2205064/johnzon-core/src/main/java/org/apache/johnzon/core/CommentsJsonStreamParserImpl.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/CommentsJsonStreamParserImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/CommentsJsonStreamParserImpl.java
index e28c03a..085fe2b 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/CommentsJsonStreamParserImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/CommentsJsonStreamParserImpl.java
@@ -21,6 +21,7 @@ package org.apache.johnzon.core;
 import java.io.InputStream;
 import java.io.Reader;
 import java.nio.charset.Charset;
+import java.util.NoSuchElementException;
 
 public class CommentsJsonStreamParserImpl extends JsonStreamParserImpl {
     public CommentsJsonStreamParserImpl(final InputStream inputStream,

http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/e2205064/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java
index d1d5968..0ef9e02 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonStreamParserImpl.java
@@ -331,6 +331,9 @@ public class JsonStreamParserImpl implements JsonChars, JsonParser{
         }
 
         final char c = readNextNonWhitespaceChar(readNextChar());
+        if (c == EOF) {
+            throw uexc("End of file hit too early");
+        }
 
         if (c == COMMA_CHAR) {