Fix #922

FasterXML · Sep 10, 2015 · af2241c · af2241c
1 parent 5183922
commit af2241c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -12,6 +12,7 @@ Project: jackson-databind
 #899: Problem serializing `ObjectReader` (and possibly `ObjectMapper`)
 #913: ObjectMapper.copy does not preserve MappingJsonFactory features
  (reported, fixed by Daniel W)
+#922: ObjectMapper.copy() does not preserve _registeredModuleTypes
 
 2.6.1 (09-Aug-2015)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
@@ -481,6 +481,14 @@ protected ObjectMapper(ObjectMapper src)
 
         // Default serializer factory is stateless, can just assign
         _serializerFactory = src._serializerFactory;
+
+        // as per [databind#922], make sure to copy registered modules as appropriate
+        Set<Object> reg = _registeredModuleTypes;
+        if (reg == null) {
+            _registeredModuleTypes = null;
+        } else {
+            _registeredModuleTypes = new LinkedHashSet<Object>(reg);
+        }
     }
 
     /**
@@ -681,7 +689,9 @@ public ObjectMapper registerModule(Module module)
             Object typeId = module.getTypeId();
             if (typeId != null) {
                 if (_registeredModuleTypes == null) {
-                    _registeredModuleTypes = new HashSet<Object>();
+                    // plus let's keep them in order too, easier to debug or expose
+                    // in registration order if that matter
+                    _registeredModuleTypes = new LinkedHashSet<Object>();
                 }
                 // try adding; if already had it, should skip
                 if (!_registeredModuleTypes.add(typeId)) {