Merge pull request #379 from cpilsworth/paranamer-naming-strategy

Fixes jackson-module-paranamer issue 5 problem with paranamer + PropertyNamingStrategy

Author: cowtowncoder

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);
             }
         }
     }
@@ -757,6 +749,8 @@ protected void _renameUsing(PropertyNamingStrategy naming)
             } else {
                 old.addAll(prop);
             }
+
+            updateCreatorProperty(prop);
         }
     }
 
@@ -858,4 +852,15 @@ private PropertyNamingStrategy _findNamingStrategy()
         return (PropertyNamingStrategy) ClassUtil.createInstance(namingClass,
                     _config.canOverrideAccessModifiers());
     }
+
+    private void updateCreatorProperty(POJOPropertyBuilder prop) {
+        if (_creatorProperties != null) {
+            for (int i = 0; i < _creatorProperties.size(); ++i) {
+                if (_creatorProperties.get(i).getInternalName().equals(prop.getInternalName())) {
+                    _creatorProperties.set(i, prop);
+                    break;
+                }
+            }
+        }
+    }
 }