Prevent race condition in TypeHandlerRegistry - simplify

LyubinskiyPavel · LyubinskiyPavel · commit 1f4528e5a0df · 2020-01-22T21:06:13.000+03:00
diff --git a/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java b/src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java
@@ -393,11 +393,9 @@ private void register(Type javaType, JdbcType jdbcType, TypeHandler<?> handler)
       Map<JdbcType, TypeHandler<?>> map = typeHandlerMap.get(javaType);
       if (map == null || map == NULL_TYPE_HANDLER_MAP) {
         map = new HashMap<>();
-        map.put(jdbcType, handler);
-        typeHandlerMap.put(javaType, map);
-      } else {
-        map.put(jdbcType, handler);
       }
+      map.put(jdbcType, handler);
+      typeHandlerMap.put(javaType, map);
     }
     allTypeHandlersMap.put(handler.getClass(), handler);
   }

Original file line number	Diff line number	Diff line change
`@@ -393,11 +393,9 @@ private void register(Type javaType, JdbcType jdbcType, TypeHandler<?> handler)`
`393`	`393`	`Map<JdbcType, TypeHandler<?>> map = typeHandlerMap.get(javaType);`
`394`	`394`	`if (map == null \|\| map == NULL_TYPE_HANDLER_MAP) {`
`395`	`395`	`map = new HashMap<>();`
`396`		`- map.put(jdbcType, handler);`
`397`		`- typeHandlerMap.put(javaType, map);`
`398`		`- } else {`
`399`		`- map.put(jdbcType, handler);`
`400`	`396`	`}`
	`397`	`+ map.put(jdbcType, handler);`
	`398`	`+ typeHandlerMap.put(javaType, map);`
`401`	`399`	`}`
`402`	`400`	`allTypeHandlersMap.put(handler.getClass(), handler);`
`403`	`401`	`}`