Minor optimization to avoid silly double-calls to very expensive lookup methods

Author: cowtowncoder

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

@@ -66,24 +66,23 @@ public ScalarDecoder createScalarValueDecoder(Schema type)
         case FLOAT:
             return READER_FLOAT;
         case INT:
-            if (AvroSchemaHelper.getTypeId(type) != null) {
-                return new IntReader(AvroSchemaHelper.getTypeId(type));
+            {
+                final String typeId = AvroSchemaHelper.getTypeId(type);
+                return (typeId != null) ? new IntReader(typeId) : READER_INT;
             }
-            return READER_INT;
         case LONG:
             return READER_LONG;
         case NULL:
             return READER_NULL;
         case STRING:
-            if (AvroSchemaHelper.getTypeId(type) != null) {
-                return new StringReader(AvroSchemaHelper.getTypeId(type));
+            {
+                final String typeId = AvroSchemaHelper.getTypeId(type);
+                return (typeId != null) ? new StringReader(typeId) : READER_STRING;
             }
-            return READER_STRING;
         case UNION:
-            /* Union is a "scalar union" if all the alternative types
-             * are scalar. One common type is that of "nullable" one,
-             * but general handling should work just fine.
-             */
+            // Union is a "scalar union" if all the alternative types
+            // are scalar. One common type is that of "nullable" one,
+            // but general handling should work just fine.
             List<Schema> types = type.getTypes();
             {
                 ScalarDecoder[] readers = new ScalarDecoder[types.size()];