Fix for issue #62. When using callSettersOnNulls MyBatis will create an

object even if a setter was called with a null. This used to work in
3.2.0 and 3.2.1 but was changed in 3.2.2. We are back to previous
version.

Author: emacarron

.gitignore

@@ -17,3 +17,4 @@
 /test.db.tmp
 /src/docbkx
 velocity.log
+/bin

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

@@ -365,19 +365,17 @@ private boolean applyPropertyMappings(ResultSetWrapper rsw, ResultMap resultMap,
           || propertyMapping.getResultSet() != null) {
         Object value = getPropertyMappingValue(rsw.getResultSet(), metaObject, propertyMapping, lazyLoader, columnPrefix);
         final String property = propertyMapping.getProperty(); // issue #541 make property optional
-        if (value != NO_VALUE && property != null && (value != null || isCallSettersOnNulls(metaObject.getSetterType(property)))) { // issue #377, call setter on nulls
-          metaObject.setValue(property, value);
+        if (value != NO_VALUE && property != null && (value != null || configuration.isCallSettersOnNulls())) { // issue #377, call setter on nulls
+          if (value != null || !metaObject.getSetterType(property).isPrimitive()) {
+            metaObject.setValue(property, value);
+          }
           foundValues = (value != null) || foundValues;
         }
       }
     }
     return foundValues;
   }
 
-  private boolean isCallSettersOnNulls(Class<?> propertyType) {
-    return configuration.isCallSettersOnNulls() && !propertyType.isPrimitive();
-  }
-
   private Object getPropertyMappingValue(ResultSet rs, MetaObject metaResultObject, ResultMapping propertyMapping, ResultLoaderMap lazyLoader, String columnPrefix)
       throws SQLException {
     if (propertyMapping.getNestedQueryId() != null) {
@@ -415,9 +413,11 @@ private boolean applyAutomaticMappings(ResultSetWrapper rsw, ResultMap resultMap
         if (typeHandlerRegistry.hasTypeHandler(propertyType)) {
           final TypeHandler<?> typeHandler = rsw.getTypeHandler(propertyType, columnName);
           final Object value = typeHandler.getResult(rsw.getResultSet(), columnName);
-          if (value != null || isCallSettersOnNulls(propertyType)) { // issue #377, call setter on nulls
-            metaObject.setValue(property, value);
-            foundValues = (value != null) || foundValues;
+          if (value != null || configuration.isCallSettersOnNulls()) { // issue #377, call setter on nulls
+            if (value != null || !propertyType.isPrimitive()) {
+              metaObject.setValue(property, value);
+            }
+            foundValues = true;
           }
         }
       }

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

@@ -95,7 +95,7 @@ public void shouldCallNullOnMapForSingleColumn() {
     try {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
       List<Map<String, Object>> oneColumns = mapper.getNameOnly();
-      Assert.assertNull(oneColumns.get(1));
+      Assert.assertNotNull(oneColumns.get(1));
     } finally {
       sqlSession.close();
     }