svn commit: r821461 - in /ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis: cache/CacheKey.java executor/resultset/DefaultResultSetHandler.java

[cbegin]

Author: cbegin
Date: Sun Oct  4 03:44:40 2009
New Revision: 821461

URL: http://svn.apache.org/viewvc?rev=821461&view=rev
Log:
Moved NULL_CACHE_KEY to CacheKey

Modified:
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheKey.java
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheKey.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheKey.java?rev=821461&r1=821460&r2=821461&view=diff
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheKey.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheKey.java
 Sun Oct  4 03:44:40 2009
@@ -4,6 +4,8 @@
 
 public class CacheKey {
 
+  public static final CacheKey NULL_CACHE_KEY = new CacheKey();
+
   private static final int DEFAULT_MULTIPLYER = 37;
   private static final int DEFAULT_HASHCODE = 17;
 

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java?rev=821461&r1=821460&r2=821461&view=diff
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
 Sun Oct  4 03:44:40 2009
@@ -35,7 +35,6 @@
 
   private final Map<CacheKey,Set<CacheKey>> localRowValueCaches;
   private final Map<CacheKey,Object> globalRowValueCache;
-  private static final CacheKey NULL_ROW_KEY = new CacheKey();
 
   public DefaultResultSetHandler(Executor executor, MappedStatement 
mappedStatement, ParameterHandler parameterHandler, ResultHandler 
resultHandler, BoundSql boundSql, int offset, int limit) {
     this.executor = executor;
@@ -192,7 +191,7 @@
         foundValues = applyNestedResultMappings(rs, resultMap, metaObject) || 
foundValues;
         resultObject = foundValues ? resultObject : null;
       }
-      if (rowKey != NULL_ROW_KEY) {
+      if (rowKey != CacheKey.NULL_CACHE_KEY) {
         globalRowValueCache.put(rowKey, resultObject);
       }
       return resultObject;
@@ -513,7 +512,7 @@
       createRowKeyForMappedProperties(rs, cacheKey, resultMappings);
     }
     if (cacheKey.getUpdateCount() < 2) {
-      return NULL_ROW_KEY;
+      return CacheKey.NULL_CACHE_KEY;
     }
     return cacheKey;
   }