Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions src/main/java/com/cognitect/transit/impl/Cache.java

This file was deleted.

12 changes: 1 addition & 11 deletions src/main/java/com/cognitect/transit/impl/ReaderFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<?,?>>();
Expand Down Expand Up @@ -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) {
Expand Down
15 changes: 1 addition & 14 deletions src/main/java/com/cognitect/transit/impl/WriterFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down