From 64408b75f29814639befca69cdda30e206169944 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Mon, 26 Aug 2019 14:40:48 -0700 Subject: [PATCH] Solve a naming conflict --- .../fasterxml/jackson/databind/util/TokenBuffer.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java b/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java index 34d3d823e0..288a25a386 100644 --- a/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java +++ b/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java @@ -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(); @@ -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; @@ -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);