fix tests

Author: jdconrad

server/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java

@@ -272,11 +272,9 @@ public static void readMultiLineFormat(
                     )
                 ) {
                     Map<String, Object> source = parser.map();
-                    // In Jackson 2.21+, parser.map() leaves the parser at END_OBJECT, need to advance past it
-                    XContentParser.Token token = parser.currentToken() == XContentParser.Token.END_OBJECT
-                        ? parser.nextToken()
-                        : parser.currentToken();
-                    if (token != null) {
+                    // In Jackson 2.21+, parser.map() may leave the parser past END_OBJECT
+                    // Only check for extra tokens if we're still positioned in the stream
+                    if (parser.currentToken() != null && parser.nextToken() != null) {
                         throw new XContentParseException(parser.getTokenLocation(), "Unexpected token after end of object");
                     }
                     Object expandWildcards = null;
@@ -364,11 +362,9 @@ public static void readMultiLineFormat(
                 )
             ) {
                 consumer.accept(searchRequest, parser);
-                // In Jackson 2.21+, after parsing, the parser may be at END_OBJECT, need to advance past it
-                XContentParser.Token token = parser.currentToken() == XContentParser.Token.END_OBJECT
-                    ? parser.nextToken()
-                    : parser.currentToken();
-                if (token != null) {
+                // In Jackson 2.21+, after parsing, the parser may be past END_OBJECT
+                // Only check for extra tokens if we're still positioned in the stream
+                if (parser.currentToken() != null && parser.nextToken() != null) {
                     throw new XContentParseException(parser.getTokenLocation(), "Unexpected token after end of object");
                 }
             }

server/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java

@@ -546,11 +546,12 @@ public void testFailOnExtraCharacters() throws IOException {
                 """);
             fail("should have caught second line; extra closing brackets");
         } catch (XContentParseException e) {
+            // Jackson 2.21.0 changed the error message format
             assertThat(
                 e.getMessage(),
                 containsString(
-                    "Unexpected close marker '}': expected ']' (for root starting at "
-                        + "[Source: (byte[])\"{ \"query\": {\"match_all\": {}}}}}}different error message\""
+                    "Unexpected close marker '}': no open Object to close\n"
+                        + " at [Source: (byte[])\"{ \"query\": {\"match_all\": {}}}}}}different error message\""
                 )
             );
         }