--amend

Author: baharclerode

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroAnnotationIntrospector.java

@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
+import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 import com.fasterxml.jackson.dataformat.avro.deser.CustomEncodingDeserializer;
@@ -161,6 +162,10 @@ public TypeResolverBuilder<?> findPropertyContentTypeResolver(MapperConfig<?> co
     }
 
     protected TypeResolverBuilder<?> _findTypeResolver(MapperConfig<?> config, Annotated ann, JavaType baseType) {
+        // If there's a custom deserializer, then it's responsible for handling any type information
+        if (config.getAnnotationIntrospector().findDeserializer(ann) != null) {
+            return StdTypeResolverBuilder.noTypeInfoBuilder();
+        }
         TypeResolverBuilder<?> resolver = new AvroTypeResolverBuilder();
         JsonTypeInfo typeInfo = ann.getAnnotation(JsonTypeInfo.class);
         if (typeInfo != null && typeInfo.defaultImpl() != JsonTypeInfo.class) {

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeDeserializer.java

@@ -54,13 +54,6 @@ public Object deserializeTypedFromScalar(JsonParser p, DeserializationContext ct
 
     @Override
     public Object deserializeTypedFromAny(JsonParser p, DeserializationContext ctxt) throws IOException {
-        AnnotationIntrospector ai = ctxt.getAnnotationIntrospector();
-        if (ai != null && _property != null) {
-            JsonDeserializer<?> deser = ctxt.deserializerInstance(_property.getMember(), ai.findDeserializer(_property.getMember()));
-            if (deser != null) {
-                return deser.deserialize(p, ctxt);
-            }
-        }
         if (p.getTypeId() == null && getDefaultImpl() == null) {
             JsonDeserializer<Object> deser = _findDeserializer(ctxt, AvroSchemaHelper.getTypeId(_baseType));
             if (deser == null) {

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/AvroParserImplDecoder.java

@@ -145,7 +145,7 @@ public ByteBuffer readBytes(ByteBuffer old) throws IOException {
             old.flip();
             return old;
         }
-        return ByteBuffer.wrap(_parser.getBinaryValue());
+        return ByteBuffer.wrap(value);
     }
 
     @Override