Fix #913: Properly copy MappingJsonFactory features

FasterXML · Sep 1, 2015 · 7d45f7f · 7d45f7f
1 parent 06e37f3
commit 7d45f7f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/com/fasterxml/jackson/databind/MappingJsonFactory.java b/src/main/java/com/fasterxml/jackson/databind/MappingJsonFactory.java
@@ -33,6 +33,14 @@ public MappingJsonFactory(ObjectMapper mapper)
         }
     }
 
+    public MappingJsonFactory(JsonFactory src, ObjectMapper mapper)
+    {
+        super(src, mapper);
+        if (mapper == null) {
+          setCodec(new ObjectMapper(this));
+        }
+    }
+
     /**
      * We'll override the method to return more specific type; co-variance
      * helps here
@@ -46,7 +54,7 @@ public JsonFactory copy()
     {
         _checkInvalidCopy(MappingJsonFactory.class);
         // note: as with base class, must NOT copy mapper reference
-        return new MappingJsonFactory(null);
+        return new MappingJsonFactory(this, null);
     }
 
     /*

diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
@@ -159,6 +159,9 @@ public void testCopy() throws Exception
         assertFalse(m.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
         InjectableValues inj = new InjectableValues.Std();
         m.setInjectableValues(inj);
+        assertFalse(m.isEnabled(JsonParser.Feature.ALLOW_COMMENTS));
+        m.enable(JsonParser.Feature.ALLOW_COMMENTS);
+        assertTrue(m.isEnabled(JsonParser.Feature.ALLOW_COMMENTS));
 
         // // First: verify that handling of features is decoupled:
 
@@ -193,6 +196,10 @@ public void testCopy() throws Exception
         assertEquals(0, m2.getSerializationConfig().mixInCount());
         assertEquals(1, m.getDeserializationConfig().mixInCount());
         assertEquals(0, m2.getDeserializationConfig().mixInCount());
+
+        // [Issue#913]: Ensure JsonFactory Features copied
+        assertTrue(m2.isEnabled(JsonParser.Feature.ALLOW_COMMENTS));
+
     }
 
     public void testAnnotationIntrospectorCopyin()