just minor twiddling wrt map key serializers, still

Author: cowtowncoder

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

@@ -264,10 +264,13 @@ protected SerializerProvider(SerializerProvider src)
      */
 
     /**
-     * Method that can be used to specify serializer that will be
-     * used to write JSON property names matching null keys for Java
-     * Maps (which will throw an exception if try write such property
-     * name)
+     * Method that can be used to specify serializer to use for serializing
+     * all non-null JSON property names, unless more specific key serializer
+     * is found (i.e. if not custom key serializer has been registered for
+     * Java type).
+     *<p>
+     * Note that key serializer registration are different from value serializer
+     * registrations.
      */
     public void setDefaultKeySerializer(JsonSerializer<Object> ks)
     {
@@ -295,13 +298,9 @@ public void setNullValueSerializer(JsonSerializer<Object> nvs)
     }
 
     /**
-     * Method that can be used to specify serializer to use for serializing
-     * all non-null JSON property names, unless more specific key serializer
-     * is found (i.e. if not custom key serializer has been registered for
-     * Java type).
-     *<p>
-     * Note that key serializer registration are different from value serializer
-     * registrations.
+     * Method that can be used to specify serializer that will be
+     * used to write JSON property names matching null keys for Java
+     * Maps (which will otherwise throw an exception if try write such property name)
      */
     public void setNullKeySerializer(JsonSerializer<Object> nks)
     {

src/main/java/com/fasterxml/jackson/databind/ser/BasicSerializerFactory.java

@@ -230,21 +230,17 @@ public JsonSerializer<Object> createKeySerializer(SerializerProvider ctxt,
                     if (ser == null) {
                         AnnotatedMember keyAm = beanDesc.findJsonKeyAccessor();
                         if (keyAm != null) {
-                            final Class<?> rawType = keyAm.getRawType();
-                            JsonSerializer<?> delegate = createKeySerializer(ctxt, config.constructType(rawType), null);
+                            JsonSerializer<?> delegate = createKeySerializer(ctxt, keyAm.getType(), defaultImpl);
                             if (config.canOverrideAccessModifiers()) {
                                 ClassUtil.checkAndFixAccess(keyAm.getMember(),
                                         config.isEnabled(MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS));
                             }
                             // null -> no TypeSerializer for key-serializer use case
                             ser = new JsonValueSerializer(keyAm, null, delegate);
-                        }
-                        if (ser == null) {
+                        } else {
                             AnnotatedMember am = beanDesc.findJsonValueAccessor();
                             if (am != null) {
-                                final Class<?> rawType = am.getRawType();
-                                JsonSerializer<?> delegate = StdKeySerializers.getStdKeySerializer(config,
-                                        rawType, true);
+                                JsonSerializer<?> delegate = createKeySerializer(ctxt, am.getType(), defaultImpl);
                                 if (config.canOverrideAccessModifiers()) {
                                     ClassUtil.checkAndFixAccess(am.getMember(),
                                             config.isEnabled(MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS));