Fix to TokenBuffer refactoring

FasterXML · Aug 25, 2019 · 751296a · 751296a
1 parent 83cee1f
commit 751296a
Showing 1 changed file with 12 additions and 5 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
@@ -1082,7 +1082,7 @@ public void copyCurrentEvent(JsonParser p) throws IOException
             writeObject(p.getEmbeddedObject());
             break;
         default:
-            throw new RuntimeException("Internal error: should never end up through this code path");
+            throw new RuntimeException("Internal error: unexpected token: "+p.getCurrentToken());
         }
     }
 
@@ -1104,7 +1104,8 @@ public void copyCurrentStructure(JsonParser p) throws IOException
         }
 
         // We'll do minor handling here to separate structured, scalar values,
-        // then delegate appropriately
+        // then delegate appropriately.
+        // Plus also deal with oddity of "dangling" END_OBJECT/END_ARRAY
         switch (t) {
         case START_ARRAY:
             if (_mayHaveNativeIds) {
@@ -1120,6 +1121,12 @@ public void copyCurrentStructure(JsonParser p) throws IOException
             writeStartObject();
             _copyContents(p);
             break;
+        case END_ARRAY:
+            writeEndArray();
+            break;
+        case END_OBJECT:
+            writeEndObject();
+            break;
         default: // others are simple:
             _copyCurrentValue(p, t);
         }
@@ -1156,16 +1163,16 @@ private final void _copyContents(JsonParser p) throws IOException
                 break;
 
             case END_ARRAY:
+                writeEndArray();
                 if (--depth == 0) {
                     return;
                 }
-                writeEndArray();
                 break;
             case END_OBJECT:
+                writeEndObject();
                 if (--depth == 0) {
                     return;
                 }
-                writeEndObject();
                 break;
 
             default:
@@ -1229,7 +1236,7 @@ private void _copyCurrentValue(JsonParser p, JsonToken t) throws IOException
             writeObject(p.getEmbeddedObject());
             break;
         default:
-            throw new RuntimeException("Internal error: should never end up through this code path");
+            throw new RuntimeException("Internal error: unexpected token: "+t);
         }
     }