Skip to content

Commit f7ed824

Browse files
committed
Polishing for mybatis#1489
* Change to use isAssignableFrom method * Add local variable to hold Enum class
1 parent 2420632 commit f7ed824

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,12 @@ private Map<JdbcType, TypeHandler<?>> getJdbcHandlerMap(Type type) {
241241
}
242242
if (jdbcHandlerMap == null && type instanceof Class) {
243243
Class<?> clazz = (Class<?>) type;
244-
if (clazz.isEnum() || (clazz.isAnonymousClass() && clazz.getEnclosingClass().isEnum())) {
245-
clazz = clazz.isAnonymousClass() ? clazz.getEnclosingClass() : clazz;
246-
jdbcHandlerMap = getJdbcHandlerMapForEnumInterfaces(clazz, clazz);
244+
if (Enum.class.isAssignableFrom(clazz)) {
245+
Class<?> enumClass = clazz.isAnonymousClass() ? clazz.getEnclosingClass() : clazz;
246+
jdbcHandlerMap = getJdbcHandlerMapForEnumInterfaces(enumClass, enumClass);
247247
if (jdbcHandlerMap == null) {
248-
register(clazz, getInstance(clazz, defaultEnumTypeHandler));
249-
return typeHandlerMap.get(clazz);
248+
register(enumClass, getInstance(enumClass, defaultEnumTypeHandler));
249+
return typeHandlerMap.get(enumClass);
250250
}
251251
} else {
252252
jdbcHandlerMap = getJdbcHandlerMapForSuperclass(clazz);

0 commit comments

Comments
 (0)