Corrected inconsistency between autoMapping=true and false when callSetterOnNull is true. Related to #307 and #62 .

Author: harawata

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

@@ -435,7 +435,7 @@ private boolean applyPropertyMappings(ResultSetWrapper rsw, ResultMap resultMap,
           foundValues = true;
           metaObject.setValue(property, value);
         } else if (configuration.isCallSettersOnNulls() && !metaObject.getSetterType(property).isPrimitive()) {
-          // issue #377, call setter on nulls (value is not 'found')
+          // gcode issue #377, call setter on nulls (value is not 'found')
           metaObject.setValue(property, value);
         }
       }
@@ -504,8 +504,7 @@ private boolean applyAutomaticMappings(ResultSetWrapper rsw, ResultMap resultMap
           foundValues = true;
           metaObject.setValue(mapping.property, value);
         } else if (configuration.isCallSettersOnNulls() && !mapping.primitive) {
-          // issue #377, call setter on nulls
-          foundValues = true;
+          // gcode issue #377, call setter on nulls (value is not 'found')
           metaObject.setValue(mapping.property, value);
         }
       }

src/test/java/org/apache/ibatis/submitted/call_setters_on_nulls/CallSettersOnNullsTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2015 the original author or authors.
+ *    Copyright 2009-2016 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -95,7 +95,10 @@ public void shouldCallNullOnMapForSingleColumn() {
     try {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
       List<Map<String, Object>> oneColumns = mapper.getNameOnly();
-      Assert.assertNotNull(oneColumns.get(1));
+      // When callSetterOnNull is true, setters are called with null values
+      // but if all the values for an object are null
+      // the object itself should be null (same as default behaviour)
+      Assert.assertNull(oneColumns.get(1));
     } finally {
       sqlSession.close();
     }