Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds check for EOF #452

Merged
merged 1 commit into from Dec 13, 2018
Merged

Adds check for EOF #452

merged 1 commit into from Dec 13, 2018

Conversation

johnjaylward
Copy link
Contributor

@johnjaylward johnjaylward commented Dec 10, 2018

What problem does this code solve?
See PR #447
Adds a check for EOF in Tokener.nextValue() before calling back().

Risks
Low. Should not affect callers

Changes to the API?
No.

Will this require a new release?
No.

Should the documentation be updated?
No.

Does it break the unit tests?
No. New unit tests added, see stleary/JSON-Java-unit-test#91

Was any code refactored in this commit?
No

Review status
APPROVED

@stleary
Copy link
Owner

stleary commented Dec 10, 2018

Looks OK, but I am seeing this error:
git pull https://github.com/johnjaylward/JSON-java.git FixEOF
warning: no common commits
remote: Enumerating objects: 6, done.
remote: Counting objects: 100% (6/6), done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 1093 (delta 1), reused 2 (delta 0), pack-reused 1087
Receiving objects: 100% (1093/1093), 762.75 KiB | 1.17 MiB/s, done.
Resolving deltas: 100% (660/660), done.
From https://github.com/johnjaylward/JSON-java

  • branch FixEOF -> FETCH_HEAD
    fatal: refusing to merge unrelated histories

@johnjaylward
Copy link
Contributor Author

I don't see any issue on my side, or on GitHub. Are you on the master branch?

@stleary
Copy link
Owner

stleary commented Dec 10, 2018

Now it is working. Approved, starting 3 day comment window.

@stleary stleary merged commit 12bbe8c into stleary:master Dec 13, 2018
stleary added a commit to stleary/JSON-Java-unit-test that referenced this pull request Dec 13, 2018
@johnjaylward johnjaylward deleted the FixEOF branch August 14, 2019 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants