Skip to content

Commit

Permalink
Solve a naming conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Aug 26, 2019
1 parent 751296a commit 64408b7
Showing 1 changed file with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1112,14 +1112,14 @@ public void copyCurrentStructure(JsonParser p) throws IOException
_checkNativeIds(p);
}
writeStartArray();
_copyContents(p);
_copyBufferContents(p);
break;
case START_OBJECT:
if (_mayHaveNativeIds) {
_checkNativeIds(p);
}
writeStartObject();
_copyContents(p);
_copyBufferContents(p);
break;
case END_ARRAY:
writeEndArray();
Expand All @@ -1128,11 +1128,11 @@ public void copyCurrentStructure(JsonParser p) throws IOException
writeEndObject();
break;
default: // others are simple:
_copyCurrentValue(p, t);
_copyBufferValue(p, t);
}
}

private final void _copyContents(JsonParser p) throws IOException
protected void _copyBufferContents(JsonParser p) throws IOException
{
int depth = 1;
JsonToken t;
Expand Down Expand Up @@ -1176,13 +1176,13 @@ private final void _copyContents(JsonParser p) throws IOException
break;

default:
_copyCurrentValue(p, t);
_copyBufferValue(p, t);
}
}
}

// NOTE: Copied from earlier `copyCurrentEvent()`
private void _copyCurrentValue(JsonParser p, JsonToken t) throws IOException
private void _copyBufferValue(JsonParser p, JsonToken t) throws IOException
{
if (_mayHaveNativeIds) {
_checkNativeIds(p);
Expand Down

0 comments on commit 64408b7

Please sign in to comment.