fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-19 07:59:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix problems discovered using nextSource() to implement skipValue (#1236)

Browse Source
This commit is contained in:
Jesse Wilson
2020-09-21 23:50:38 -04:00
committed by GitHub
parent 0a78ed4cb1
commit 53c1bf0cac
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
moshi/src/main/java/com/squareup/moshi/JsonUtf8Reader.java
View File

@@ -329,8 +329,6 @@ final class JsonUtf8Reader extends JsonReader {
valueSource.discard(); valueSource.discard();
valueSource = null; valueSource = null;
stackSize--; stackSize--;
pathIndices[stackSize - 1]++;
pathNames[stackSize - 1] = "null";
return doPeek(); return doPeek();
} else if (peekStack == JsonScope.CLOSED) { } else if (peekStack == JsonScope.CLOSED) {
throw new IllegalStateException("JsonReader is closed"); throw new IllegalStateException("JsonReader is closed");
@@ -564,6 +562,7 @@ final class JsonUtf8Reader extends JsonReader {
result = nextQuotedValue(SINGLE_QUOTE_OR_SLASH); result = nextQuotedValue(SINGLE_QUOTE_OR_SLASH);
} else if (p == PEEKED_BUFFERED_NAME) { } else if (p == PEEKED_BUFFERED_NAME) {
result = peekedString; result = peekedString;
peekedString = null;
} else { } else {
throw new JsonDataException("Expected a name but was " + peek() + " at path " + getPath()); throw new JsonDataException("Expected a name but was " + peek() + " at path " + getPath());
} }
@@ -1069,9 +1068,14 @@ final class JsonUtf8Reader extends JsonReader {
throw new JsonDataException("Expected a value but was " + peek() + " at path " + getPath()); throw new JsonDataException("Expected a value but was " + peek() + " at path " + getPath());
} }
// Advance the path and clear peeked if we haven't already.
if (peeked != PEEKED_NONE) {
pathIndices[stackSize - 1]++;
peeked = PEEKED_NONE;
}
valueSource = new JsonValueSource(source, prefix, state, valueSourceStackSize); valueSource = new JsonValueSource(source, prefix, state, valueSourceStackSize);
pushScope(JsonScope.STREAMING_VALUE); pushScope(JsonScope.STREAMING_VALUE);
peeked = PEEKED_NONE;
return Okio.buffer(valueSource); return Okio.buffer(valueSource);
} }