Fix for #39. No need to create keys with null values.

mybatis · Dec 23, 2015 · 4dd3384 · 4dd3384
1 parent a289c57
commit 4dd3384
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java b/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
@@ -956,7 +956,7 @@ private CacheKey createRowKey(ResultMap resultMap, ResultSetWrapper rsw, String
       createRowKeyForMappedProperties(resultMap, rsw, cacheKey, resultMappings, columnPrefix);
     }
     if (cacheKey.getUpdateCount() < 2) {
-      return CacheKey.NULL_CACHE_KEY; // fix for #39
+      return CacheKey.NULL_CACHE_KEY;
     }    
     return cacheKey;
   }
@@ -997,8 +997,10 @@ private void createRowKeyForMappedProperties(ResultMap resultMap, ResultSetWrapp
         // Issue #114
         if (column != null && mappedColumnNames.contains(column.toUpperCase(Locale.ENGLISH))) {
           final Object value = th.getResult(rsw.getResultSet(), column);
-          cacheKey.update(column);  // fix for #39 (removed if)
-          cacheKey.update(value);
+          if (value != null) {
+            cacheKey.update(column);
+            cacheKey.update(value);
+          }
         }
       }
     }