File tree 1 file changed +5
-2
lines changed
src/main/java/org/apache/ibatis/executor/resultset
1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change 1
1
/**
2
- * Copyright 2009-2016 the original author or authors.
2
+ * Copyright 2009-2017 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
@@ -477,7 +477,10 @@ private List<UnMappedColumnAutoMapping> createAutomaticMappings(ResultSetWrapper
477
477
}
478
478
}
479
479
final String property = metaObject .findProperty (propertyName , configuration .isMapUnderscoreToCamelCase ());
480
- if (property != null && metaObject .hasSetter (property ) && !resultMap .getMappedProperties ().contains (property )) {
480
+ if (property != null && metaObject .hasSetter (property )) {
481
+ if (resultMap .getMappedProperties ().contains (property )) {
482
+ continue ;
483
+ }
481
484
final Class <?> propertyType = metaObject .getSetterType (property );
482
485
if (typeHandlerRegistry .hasTypeHandler (propertyType , rsw .getJdbcType (columnName ))) {
483
486
final TypeHandler <?> typeHandler = rsw .getTypeHandler (propertyType , columnName );
You can’t perform that action at this time.
0 commit comments