Minor addition to JavaType (getContainedTypeOrUnknown()); fix a tiny potential problem with JsonValueSerializer contextualization

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/JavaType.java

@@ -3,6 +3,7 @@
 import java.lang.reflect.Modifier;
 
 import com.fasterxml.jackson.core.type.ResolvedType;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 
 /**
  * Base class for type token classes used both to contain information
@@ -319,10 +320,37 @@ public boolean isConcrete() {
 
     @Override
     public JavaType containedType(int index) { return null; }
-
+       
     @Override
     public String containedTypeName(int index) { return null; }
 
+    /*
+    /**********************************************************
+    /* Extended API beyond ResolvedType
+    /**********************************************************
+     */
+    
+    // NOTE: not defined in Resolved type
+    /**
+     * Convenience method that is functionally same as:
+     *<code>
+     * JavaType t = containedType(index);
+     * if (t == null) {
+     *    t = TypeFactory.unknownType();
+     * }
+     *</code>
+     * and typically used to eliminate need for null checks for common case
+     * where we just want to check if containedType is available first; and
+     * if not, use "unknown type" (which translates to <code>java.lang.Object</code>
+     * basically).
+     *
+     * @since 2.5
+     */
+    public JavaType containedTypeOrUnknown(int index) {
+        JavaType t = containedType(index);
+        return (t == null)  ? TypeFactory.unknownType() : t;
+    }
+
     /*
     /**********************************************************
     /* Semi-public API, accessing handlers

src/main/java/com/fasterxml/jackson/databind/ser/std/JsonValueSerializer.java

@@ -125,7 +125,7 @@ public JsonSerializer<?> createContextual(SerializerProvider provider,
                  *   to serializer factory at this point... 
                  */
                 // 05-Sep-2013, tatu: I _think_ this can be considered a primary property...
-                ser = provider.findPrimaryPropertySerializer(t, _property);
+                ser = provider.findPrimaryPropertySerializer(t, property);
                 /* 09-Dec-2010, tatu: Turns out we must add special handling for
                  *   cases where "native" (aka "natural") type is being serialized,
                  *   using standard serializer

src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java

@@ -660,7 +660,7 @@ public JsonNode getSchema(SerializerProvider provider, Type typeHint)
         // there's no way to statically determine the keys, so the "Entries" can't be determined.
         return o;
     }
-    
+
     @Override
     public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
         throws JsonMappingException