Merge pull request #45 from cognitect/cache-fix

Author: puredanger

src/main/java/com/cognitect/transit/impl/Cache.java

@@ -15,8 +15,6 @@
 
 public class ReaderFactory {
 
-    private static Map<Map<String, ReadHandler<?,?>>, ReadHandlerMap> handlerCache = new Cache<Map<String, ReadHandler<?,?>>, ReadHandlerMap>();
-
     public static Map<String, ReadHandler<?,?>> defaultHandlers() {
 
         Map<String, ReadHandler<?,?>> handlers = new HashMap<String, ReadHandler<?,?>>();
@@ -58,15 +56,7 @@ private static Map<String, ReadHandler<?,?>> handlerMap(Map<String, ReadHandler<
         if (customHandlers instanceof ReadHandlerMap) {
             return customHandlers;
         }
-
-        synchronized (ReaderFactory.class) {
-            ReadHandlerMap readHandlerMap = handlerCache.get(customHandlers);
-            if (readHandlerMap == null) {
-                readHandlerMap = new ReadHandlerMap(customHandlers);
-                handlerCache.put(customHandlers, readHandlerMap);
-            }
-            return readHandlerMap;
-        }
+        return new ReadHandlerMap(customHandlers);
     }
 
     private static DefaultReadHandler defaultHandler(DefaultReadHandler customDefaultHandler) {

src/main/java/com/cognitect/transit/impl/ReaderFactory.java

@@ -17,21 +17,8 @@
 
 public class WriterFactory {
 
-    private static final Map<Map<Class, WriteHandler<?,?>>, WriteHandlerMap> handlerCache = new Cache<Map<Class, WriteHandler<?,?>>, WriteHandlerMap>();
-
     private static WriteHandlerMap buildWriteHandlerMap(Map<Class, WriteHandler<?, ?>> customHandlers) {
-        if (customHandlers instanceof WriteHandlerMap)
-            return new WriteHandlerMap(customHandlers);
-
-        WriteHandlerMap writeHandlerMap;
-        synchronized (handlerCache) {
-            writeHandlerMap = handlerCache.get(customHandlers);
-            if (writeHandlerMap == null) {
-                writeHandlerMap = new WriteHandlerMap(customHandlers);
-                handlerCache.put(customHandlers, writeHandlerMap);
-            }
-        }
-        return new WriteHandlerMap(writeHandlerMap);
+        return new WriteHandlerMap(customHandlers);
     }
 
     private static WriteHandlerMap verboseHandlerMap(Map<Class, WriteHandler<?, ?>> customHandlers) {