Merge branch '2.15' into 2.16

FasterXML · Feb 13, 2024 · 4fc5def · 4fc5def
2 parents ccabd8e + 901ba02
commit 4fc5def
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -150,6 +150,10 @@ Project: jackson-databind
 #4303: `ObjectReader` is not serializable if it's configured for polymorphism
  (reported by @asardaes)
  (fix contributed by Joo-Hyuk K)
+#4378: `TextNode.equals()` throws `NullPointerException` when `TextNode`
+  constructed with `null`
+ (reported by @Javed6234)
+ (fix contributed by @pjfanning)
 
 2.15.3 (12-Oct-2023)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/node/TextNode.java b/src/main/java/com/fasterxml/jackson/databind/node/TextNode.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.databind.node;
 
 import java.io.IOException;
+import java.util.Objects;
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.CharTypes;
@@ -164,13 +165,16 @@ public boolean equals(Object o)
         if (o == this) return true;
         if (o == null) return false;
         if (o instanceof TextNode) {
-            return ((TextNode) o)._value.equals(_value);
+            TextNode otherNode = (TextNode) o;
+            return Objects.equals(otherNode._value, _value);
         }
         return false;
     }
 
     @Override
-    public int hashCode() { return _value.hashCode(); }
+    public int hashCode() {
+        return Objects.hashCode(_value);
+    }
 
     @Deprecated // since 2.10
     protected static void appendQuoted(StringBuilder sb, String content)

diff --git a/src/test/java/com/fasterxml/jackson/databind/node/TextNodeTest.java b/src/test/java/com/fasterxml/jackson/databind/node/TextNodeTest.java
@@ -1,5 +1,7 @@
 package com.fasterxml.jackson.databind.node;
 
+import static org.junit.Assert.assertNotEquals;
+
 public class TextNodeTest extends NodeTestBase
 {
     public void testText()
@@ -36,4 +38,19 @@ public void testText()
         assertFalse(TextNode.valueOf("false").asBoolean(true));
         assertFalse(TextNode.valueOf("false").asBoolean(false));
     }
+
+    public void testEquals()
+    {
+        assertEquals(new TextNode(null), new TextNode(null));
+        assertEquals(new TextNode("abc"), new TextNode("abc"));
+        assertNotEquals(new TextNode(null), new TextNode("def"));
+        assertNotEquals(new TextNode("abc"), new TextNode("def"));
+        assertNotEquals(new TextNode("abc"), new TextNode(null));
+    }
+
+    public void testHashCode()
+    {
+        assertEquals(0, new TextNode(null).hashCode());
+        assertEquals("abc".hashCode(), new TextNode("abc").hashCode());
+    }
 }