svn commit: r821464 - in /ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset: DefaultResultSetHandler.java NoValue.java

[cbegin]

Author: cbegin
Date: Sun Oct  4 04:24:46 2009
New Revision: 821464

URL: http://svn.apache.org/viewvc?rev=821464&view=rev
Log:
Eliminated need for NoValue enum.

Removed:
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NoValue.java
Modified:
    
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/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=821464&r1=821463&r2=821464&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 04:24:46 2009
@@ -8,7 +8,6 @@
 import org.apache.ibatis.reflection.MetaClass;
 import org.apache.ibatis.executor.ExecutorException;
 import org.apache.ibatis.executor.Executor;
-import static org.apache.ibatis.executor.resultset.NoValue.NO_VALUE;
 import org.apache.ibatis.executor.loader.ResultLoader;
 import org.apache.ibatis.executor.loader.ResultLoaderRegistry;
 import org.apache.ibatis.executor.loader.ResultObjectProxy;
@@ -440,7 +439,7 @@
           localRowValueCache.add(rowKey);
           Object rowValue = getRowValue(rs, nestedResultMap, rowKey);
 
-          if (rowValue != null && rowValue != NO_VALUE) {
+          if (rowValue != null) {
             if (collectionProperty != null && collectionProperty instanceof 
Collection) {
               if (!knownValue) {
                 ((Collection) collectionProperty).add(rowValue);