Merge branch '2.x' into 3.x

Author: cowtowncoder

avro/src/main/java/tools/jackson/dataformat/avro/schema/RecordVisitor.java

@@ -66,9 +66,10 @@ public RecordVisitor(SerializationContext p, JavaType type, VisitorFormatWrapper
         } else if (subTypes != null && !subTypes.isEmpty()) {
             List<Schema> unionSchemas = new ArrayList<>();
             for (NamedType subType : subTypes) {
-                ValueSerializer<?> ser = getContext().findValueSerializer(subType.getType());
+                final JavaType subTypeType = getContext().getTypeFactory().constructType(subType.getType());
+                ValueSerializer<?> ser = getContext().findValueSerializer(subTypeType);
                 VisitorFormatWrapperImpl visitor = _visitorWrapper.createChildWrapper();
-                ser.acceptJsonFormatVisitor(visitor, getContext().getTypeFactory().constructType(subType.getType()));
+                ser.acceptJsonFormatVisitor(visitor, subTypeType);
                 unionSchemas.add(visitor.getAvroSchema());
             }
             _avroSchema = Schema.createUnion(unionSchemas);