fix JsonFraming to accept multiple top-level arrays (#26098) (#26099)

2019-09-13 02:42:22 +02:00 · 2019-09-13 02:42:22 +02:00 · 489f7c2288
commit 489f7c2288
parent 4c894d628f
2 changed files with 27 additions and 4 deletions
--- a/akka-stream/src/main/scala/akka/stream/impl/JsonObjectParser.scala
+++ b/akka-stream/src/main/scala/akka/stream/impl/JsonObjectParser.scala
@ -116,7 +116,8 @@ import scala.annotation.switch
      trimFront += 1
    } else if (input == SquareBraceEnd && outsideObject) {
      // outer array completed!
-      pos = -1
+      pos += 1
+      trimFront += 1
    } else if (input == Comma && outsideObject) {
      // do nothing
      pos += 1
@ -137,9 +138,7 @@ import scala.annotation.switch
      isStartOfEscapeSequence = false
      depth -= 1
      pos += 1
-      if (depth == 0) {
-        completedObject = true
-      }
+      if (depth == 0) completedObject = true
    } else if (isWhitespace(input) && !inStringExpression) {
      pos += 1
      if (depth == 0) trimFront += 1