Try more

Author: Tim-Brooks

server/src/main/java/org/elasticsearch/index/mapper/DotExpandingXContentParser.java

@@ -58,7 +58,7 @@ public Token nextToken() throws IOException {
             Token token;
             // cache object field (even when final this is a valid optimization, see https://openjdk.org/jeps/8132243)
             var parsers = this.parsers;
-            while ((token = currentParser.nextToken()) == null) {
+            while ((token = getNextToken(currentParser)) == null) {
                 currentParser = parsers.pollFirst();
                 if (currentParser == null) {
                     return null;
@@ -72,6 +72,14 @@ public Token nextToken() throws IOException {
             return Token.FIELD_NAME;
         }
 
+        private static Token getNextToken(XContentParser parser) throws IOException {
+            if (parser instanceof DotExpandingXContentParser dot) {
+                return dot.nextToken();
+            } else {
+                return parser.nextToken();
+            }
+        }
+
         private void expandDots(XContentParser delegate) throws IOException {
             // this handles fields that belong to objects that can't hold subobjects, where the document specifies
             // the object holding the flat fields