Skip to content

Commit a5895f7

Browse files
committed
Improve contributing code for gh-895
1 parent 978b922 commit a5895f7

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2016 the original author or authors.
2+
* Copyright 2009-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -477,7 +477,10 @@ private List<UnMappedColumnAutoMapping> createAutomaticMappings(ResultSetWrapper
477477
}
478478
}
479479
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+
}
481484
final Class<?> propertyType = metaObject.getSetterType(property);
482485
if (typeHandlerRegistry.hasTypeHandler(propertyType, rsw.getJdbcType(columnName))) {
483486
final TypeHandler<?> typeHandler = rsw.getTypeHandler(propertyType, columnName);

0 commit comments

Comments
 (0)