Merge branch '2.x' into 3.x

Author: cowtowncoder

src/main/java/tools/jackson/dataformat/xml/deser/FromXmlParser.java

@@ -953,18 +953,18 @@ public boolean isNaN() {
 
     @Override
     public NumberType getNumberType() {
-        if (_numTypesValid == NR_UNKNOWN) {
-            _checkNumericValue(NR_UNKNOWN); // will also check event type
-        }
-        // Only integer types supported so...
-        
-        if ((_numTypesValid & NR_INT) != 0) {
-            return NumberType.INT;
-        }
-        if ((_numTypesValid & NR_LONG) != 0) {
-            return NumberType.LONG;
+        if (_numTypesValid != NR_UNKNOWN) {
+            // Only integer types supported (via `isExpectedNumberIntToken
+            if ((_numTypesValid & NR_INT) != 0) {
+                return NumberType.INT;
+            }
+            if ((_numTypesValid & NR_LONG) != 0) {
+                return NumberType.LONG;
+            }
+            return NumberType.BIG_INTEGER;
         }
-        return NumberType.BIG_INTEGER;
+        // 31-May-2025, tatu: [core#1434] Return null for unknown in 3.0
+        return null;
     }
 
     @Override

src/test/java/tools/jackson/dataformat/xml/deser/XmlNumberParsingGetType1433Test.java

@@ -3,14 +3,12 @@
 import org.junit.jupiter.api.Test;
 
 import tools.jackson.core.*;
-import tools.jackson.core.exc.StreamReadException;
 
 import tools.jackson.dataformat.xml.*;
 
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 public class XmlNumberParsingGetType1433Test
     extends XmlTestUtil
@@ -35,20 +33,14 @@ void getNumberType() throws Exception
         assertEquals(JsonParser.NumberType.INT, p.getNumberType());
         assertToken(JsonToken.END_OBJECT, p.nextToken());
         _verifyGetNumberTypeFail(p, "END_OBJECT");
-        assertNull(p.nextToken());
-        _verifyGetNumberTypeFail(p, "null");
         p.close();
         _verifyGetNumberTypeFail(p, "null");
     }
 
     private void _verifyGetNumberTypeFail(JsonParser p, String token) throws Exception
     {
-        try {
-            p.getNumberType();
-            fail("Should not pass");
-        } catch (StreamReadException e) {
-            verifyException(e, "Current token ("+token+") not numeric, cannot use numeric");
-        }
+        // In 2.x got exception; in 3.x null
+        assertNull(p.getNumberType());
     }
 
     private JsonParser _createParser(String text) throws Exception {