One last (?) fix to schema access for GuavaOptionalSerializer

FasterXML · Sep 22, 2014 · 7b5c7b7 · 7b5c7b7
1 parent 959aa0f
commit 7b5c7b7
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/datatype/guava/ser/GuavaOptionalSerializer.java b/src/main/java/com/fasterxml/jackson/datatype/guava/ser/GuavaOptionalSerializer.java
@@ -113,13 +113,16 @@ public void serializeWithType(Optional<?> value,
     @Override
     public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint) throws JsonMappingException
     {
-        JavaType typeParameter = typeHint.containedType(0);
-        if (typeParameter != null) {
-            JsonSerializer<?> ser = visitor.getProvider().findValueSerializer(typeParameter, null);
-            ser.acceptJsonFormatVisitor(visitor, typeParameter);
-            return;
+        JavaType valueType = _valueType();
+        if (valueType != null) {
+            JsonSerializer<?> ser = _valueSerializer;
+            if (ser == null) {
+                ser = visitor.getProvider().findValueSerializer(valueType, null);
+            }
+            ser.acceptJsonFormatVisitor(visitor, valueType);
+        } else {
+            super.acceptJsonFormatVisitor(visitor, typeHint);
         }
-        super.acceptJsonFormatVisitor(visitor, typeHint);
     }
 
     protected JavaType _valueType() {