This repository was archived by the owner on Nov 7, 2024. It is now read-only.

Commit 8d3fe0c

lukasjm0mus

authored and

committed

fix remaining regressions from 1.0.4 (#85)

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>

1 parent 43c85bf commit 8d3fe0cCopy full SHA for 8d3fe0c

File tree

+19

-5

lines changed

+19

-5

lines changed

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,7 @@ public void skipArray() {`
`306`	`306`	`if (currentEvent == Event.START_ARRAY) {`
`307`	`307`	`currentContext.skip();`
`308`	`308`	`currentContext = stack.pop();`
	`309`	`+ currentEvent = Event.END_ARRAY;`
`309`	`310`	`}`
`310`	`311`	`}`
`311`	`312`
`@@ -314,6 +315,7 @@ public void skipObject() {`
`314`	`315`	`if (currentEvent == Event.START_OBJECT) {`
`315`	`316`	`currentContext.skip();`
`316`	`317`	`currentContext = stack.pop();`
	`318`	`+ currentEvent = Event.END_OBJECT;`
`317`	`319`	`}`
`318`	`320`	`}`
`319`	`321`
`@@ -352,11 +354,16 @@ public JsonLocation getLastCharLocation() {`
`352`	`354`
`353`	`355`	`@Override`
`354`	`356`	`public boolean hasNext() {`
`355`		`- if (!tokenizer.hasNextToken()) {`
`356`		`- if (!stack.isEmpty()) {`
`357`		`- currentContext.getNextEvent();`
	`357`	`+ if (stack.isEmpty() && (currentEvent != null && currentEvent.compareTo(Event.KEY_NAME) > 0)) {`
	`358`	`+ JsonToken token = tokenizer.nextToken();`
	`359`	`+ if (token != JsonToken.EOF) {`
	`360`	`+ throw new JsonParsingException(JsonMessages.PARSER_EXPECTED_EOF(token),`
	`361`	`+ getLastCharLocation());`
`358`	`362`	`}`
`359`	`363`	`return false;`
	`364`	`+ } else if (!stack.isEmpty() && !tokenizer.hasNextToken()) {`
	`365`	`+ currentEvent = currentContext.getNextEvent();`
	`366`	`+ return false;`
`360`	`367`	`}`
`361`	`368`	`return true;`
`362`	`369`	`}`
`@@ -583,4 +590,4 @@ void skip() {`
`583`	`590`	`}`
`584`	`591`	`}`
`585`	`592`
`586`		`-}`
	`593`	`+}`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -802,6 +802,13 @@ public void testExceptionsFromHasNext() {`
`802`	`802`	`checkExceptionFromHasNext("{\"unique\":true,\"name\":\"jUnitTestIndexNeg005\", \"fields\":[{\"order\":-1,\"path\":\"city.zip\"}");`
`803`	`803`	`}`
`804`	`804`
	`805`	`+ public void testEOFFromHasNext() {`
	`806`	`+ checkExceptionFromHasNext("{ \"d\" : 1 } 2 3 4");`
	`807`	`+ checkExceptionFromHasNext("[ {\"d\" : 1 }] 2 3 4");`
	`808`	`+ checkExceptionFromHasNext("1 2 3 4");`
	`809`	`+ checkExceptionFromHasNext("null 2 3 4");`
	`810`	`+ }`
	`811`	`+`
`805`	`812`	`public void testExceptionsFromNext() {`
`806`	`813`	`checkExceptionFromNext("{\"name\" : fal");`
`807`	`814`	`checkExceptionFromNext("{\"name\" : nu");`
`@@ -841,4 +848,4 @@ private void checkExceptionFromNext(String input) {`
`841`	`848`	`}`
`842`	`849`	`fail();`
`843`	`850`	`}`
`844`		`-}`
	`851`	`+}`

Comments

(0)