File tree Expand file tree Collapse file tree 1 file changed +5
-2
lines changed
src/main/java/org/apache/ibatis/executor/resultset Expand file tree Collapse file tree 1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change 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 );
You can’t perform that action at this time.
0 commit comments