Minor fixing; make creatorMode nullable again

Author: cowtowncoder

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

@@ -734,13 +734,13 @@ protected void _addCreators(Map<String, POJOPropertyBuilder> props)
     private boolean _isDelegatingConstructor(PotentialCreator ctor)
     {
         // First things first: could be 
-        switch (ctor.creatorMode()) {
+        switch (ctor.creatorModeOrDefault()) {
         case DELEGATING:
             return true;
         case DISABLED:
         case PROPERTIES:
             return false;
-        default:
+        default: // case DEFAULT:
         }
 
         // Only consider single-arg case, for now
@@ -797,7 +797,7 @@ private void _removeNonFactoryStaticMethods(List<PotentialCreator> ctors,
         while (it.hasNext()) {
             // explicit mode? Retain (for now)
             PotentialCreator ctor = it.next();
-            if (ctor.creatorMode() != null) {
+            if (ctor.creatorMode() != JsonCreator.Mode.DEFAULT) {
                 continue;
             }
             // Do not trim canonical either

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

@@ -19,6 +19,9 @@ public class PotentialCreator
 
     private final AnnotatedWithParams creator;
 
+    /**
+     * Declared Mode of the creator, if explicitly annotated; {@code null} otherwise
+     */
     private JsonCreator.Mode creatorMode;
 
     private PropertyName[] implicitParamNames;
@@ -35,9 +38,6 @@ public PotentialCreator(AnnotatedWithParams cr,
             JsonCreator.Mode cm)
     {
         creator = cr;
-        if (cm == null) {
-            cm = JsonCreator.Mode.DEFAULT;
-        }
         creatorMode = cm;
     }
 
@@ -51,9 +51,6 @@ public PotentialCreator(AnnotatedWithParams cr,
      * @return This creator instance
      */
     public PotentialCreator overrideMode(JsonCreator.Mode mode) {
-        if (mode == null) {
-            mode = JsonCreator.Mode.DEFAULT;
-        }
         creatorMode = mode;
         return this;
     }
@@ -141,10 +138,25 @@ public AnnotatedWithParams creator() {
         return creator;
     }
 
+    /**
+     * @return Mode declared for this Creator by annotation, if any; {@code null}
+     *    if not annotated
+     */
     public JsonCreator.Mode creatorMode() {
         return creatorMode;
     }
 
+    /**
+     * Same as {@link #creatorMode()} except that if {@code null} was to be
+     * returned, will instead return {@code JsonCreator.Mode.DEFAULT}/
+     */
+    public JsonCreator.Mode creatorModeOrDefault() {
+        if (creatorMode == null) {
+            return JsonCreator.Mode.DEFAULT;
+        }
+        return creatorMode;
+    }
+
     public int paramCount() {
         return creator.getParameterCount();
     }