Merge branch 'master' of github.com:FasterXML/jackson-databind

cowtowncoder · cowtowncoder · commit 77c3f1f32eb7 · 2013-10-21T20:40:58.000-07:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java
@@ -187,7 +187,7 @@ public static MapSerializer construct(String[] ignoredList, JavaType mapType,
             JsonSerializer<Object> keySerializer, JsonSerializer<Object> valueSerializer)
     {
         return construct(ignoredList, mapType, staticValueType, vts,
-                keySerializer, valueSerializer);
+                keySerializer, valueSerializer, null);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public static MapSerializer construct(String[] ignoredList, JavaType mapType,`
`187`	`187`	`JsonSerializer<Object> keySerializer, JsonSerializer<Object> valueSerializer)`
`188`	`188`	`{`
`189`	`189`	`return construct(ignoredList, mapType, staticValueType, vts,`
`190`		`- keySerializer, valueSerializer);`
	`190`	`+ keySerializer, valueSerializer, null);`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`/**`