Backport for #379 in 2.3

Author: cowtowncoder

release-notes/VERSION

@@ -3,6 +3,9 @@ Version: 2.3.2 (xx-xxx-2014)
 
 #378: Fix a problem with custom enum deserializer construction
  (reported by BokoEnos@github)
+#379: Fix a problem with (re)naming of Creator properties; needed to make
+ Paranamer module work with NamingStrategy.
+ (reported by Chris P, cpilsworth@github)
 
 ------------------------------------------------------------------------
 === History: ===

src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java

@@ -700,16 +700,8 @@ protected void _renameProperties()
                 } else {
                     old.addAll(prop);
                 }
-
                 // replace the creatorProperty too, if there is one
-                if (_creatorProperties != null) {
-                    for (int i = 0; i < _creatorProperties.size(); ++i) {
-                        if (_creatorProperties.get(i).getInternalName().equals(prop.getInternalName())) {
-                            _creatorProperties.set(i, prop);
-                            break;
-                        }
-                    }
-                }
+                _updateCreatorProperty(prop, _creatorProperties);
             }
         }
     }
@@ -757,6 +749,8 @@ protected void _renameUsing(PropertyNamingStrategy naming)
             } else {
                 old.addAll(prop);
             }
+            // replace the creatorProperty too, if there is one
+            _updateCreatorProperty(prop, _creatorProperties);
         }
     }
 
@@ -858,4 +852,15 @@ private PropertyNamingStrategy _findNamingStrategy()
         return (PropertyNamingStrategy) ClassUtil.createInstance(namingClass,
                     _config.canOverrideAccessModifiers());
     }
+
+    protected void _updateCreatorProperty(POJOPropertyBuilder prop, List<POJOPropertyBuilder> creatorProperties) {
+        if (creatorProperties != null) {
+            for (int i = 0, len = creatorProperties.size(); i < len; ++i) {
+                if (creatorProperties.get(i).getInternalName().equals(prop.getInternalName())) {
+                    creatorProperties.set(i, prop);
+                    break;
+                }
+            }
+        }
+    }
 }