Minor tweaks post #3568

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/node/ArrayNode.java

@@ -143,6 +143,10 @@ protected ArrayNode _withArray(JsonPointer origPtr,
     protected ObjectNode _withObjectAddTailElement(JsonPointer tail, boolean preferIndex)
     {
         final int index = tail.getMatchingIndex();
+        if (index < 0) {
+            return null;
+        }
+
         tail = tail.tail();
 
         // First: did we complete traversal? If so, easy, we got our result
@@ -166,6 +170,9 @@ protected ObjectNode _withObjectAddTailElement(JsonPointer tail, boolean preferI
     protected ArrayNode _withArrayAddTailElement(JsonPointer tail, boolean preferIndex)
     {
         final int index = tail.getMatchingIndex();
+        if (index < 0) {
+            return null;
+        }
         tail = tail.tail();
 
         // First: did we complete traversal? If so, easy, we got our result

src/test/java/com/fasterxml/jackson/databind/node/ObjectNodeTest.java

@@ -299,7 +299,7 @@ public void testRetain()
         assertEquals("c", ob.get("c").textValue());
     }
 
-    public void testValidWith() throws Exception
+    public void testValidWithObject() throws Exception
     {
         ObjectNode root = MAPPER.createObjectNode();
         assertEquals("{}", MAPPER.writeValueAsString(root));
@@ -317,27 +317,52 @@ public void testValidWithArray() throws Exception
         assertEquals("{\"arr\":[]}", MAPPER.writeValueAsString(root));
     }
 
-    public void testInvalidWith() throws Exception
+    public void testInvalidWithObject() throws Exception
     {
         JsonNode root = MAPPER.createArrayNode();
         try { // should not work for non-ObjectNode nodes:
-            root.with("prop");
+            root.withObject("/prop");
             fail("Expected exception");
         } catch (UnsupportedOperationException e) {
-            verifyException(e, "not of type `ObjectNode`");
+            verifyException(e, "Cannot replace context node (of type");
+            verifyException(e, "ArrayNode");
         }
         // also: should fail of we already have non-object property
         ObjectNode root2 = MAPPER.createObjectNode();
         root2.put("prop", 13);
         try { // should not work for non-ObjectNode nodes:
-            root2.with("prop");
+            root2.withObject("/prop");
             fail("Expected exception");
         } catch (UnsupportedOperationException e) {
-            verifyException(e, "has value that is not");
+            verifyException(e, "Cannot replace `JsonNode` of type ");
+            verifyException(e, "IntNode");
         }
     }
 
     public void testInvalidWithArray() throws Exception
+    {
+        JsonNode root = MAPPER.createArrayNode();
+        try { // should not work for non-ObjectNode nodes:
+            root.withArray("/prop");
+            fail("Expected exception");
+        } catch (UnsupportedOperationException e) {
+            verifyException(e, "Cannot replace context node (of type");
+            verifyException(e, "ArrayNode");
+        }
+        // also: should fail of we already have non-Array property
+        ObjectNode root2 = MAPPER.createObjectNode();
+        root2.put("prop", 13);
+        try { // should not work for non-ObjectNode nodes:
+            root2.withArray("/prop");
+            fail("Expected exception");
+        } catch (UnsupportedOperationException e) {
+            verifyException(e, "Cannot replace `JsonNode` of type ");
+            verifyException(e, "IntNode");
+        }
+    }
+
+    // Test for pre-2.14 behavior for "simple property"
+    public void testInvalidWithArrayLegacy() throws Exception
     {
         JsonNode root = MAPPER.createArrayNode();
         try { // should not work for non-ObjectNode nodes:
@@ -356,7 +381,7 @@ public void testInvalidWithArray() throws Exception
             verifyException(e, "has value that is not");
         }
     }
-
+    
     public void testSetAll() throws Exception
     {
         ObjectNode root = MAPPER.createObjectNode();

src/test/java/com/fasterxml/jackson/databind/node/WithPathTest.java

@@ -28,6 +28,18 @@ public void testValidWithObjectSimpleExisting() throws Exception
         _testValidWithObjectSimpleExisting(false);
     }
 
+    public void testInvalidWithObjectTrivial() throws Exception
+    {
+        ArrayNode root = MAPPER.createArrayNode();
+        try {
+            root.withObject(JsonPointer.compile("/a"));
+            fail("Should not pass");
+        } catch (UnsupportedOperationException e) {
+            verifyException(e, "Cannot replace context node");
+            verifyException(e, "ArrayNode");
+        }
+    }
+
     private void _testValidWithObjectSimpleExisting(boolean compile) throws Exception
     {
         final String DOC_STR = a2q("{'a':{'b':42,'c':{'x':1}}}");
@@ -214,6 +226,18 @@ public void testValidWithArraySimple() throws Exception {
         _testValidWithArraySimple(false);
     }
 
+    public void testInvalidWithArrayTrivial() throws Exception
+    {
+        ArrayNode root = MAPPER.createArrayNode();
+        try {
+            root.withArray(JsonPointer.compile("/a"));
+            fail("Should not pass");
+        } catch (UnsupportedOperationException e) {
+            verifyException(e, "Cannot replace context node");
+            verifyException(e, "ArrayNode");
+        }
+    }
+
     private void _testValidWithArraySimple(boolean compile) throws Exception
     {
         final String DOC_STR = a2q(