svn commit: r819459 - in /ibatis/java/ibatis-3/trunk: ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

[cbegin]

Author: cbegin
Date: Mon Sep 28 06:51:35 2009
New Revision: 819459

URL: http://svn.apache.org/viewvc?rev=819459&view=rev
Log:
Fixed one of 3 failing legacy tests.  2 to go.

Modified:
    
ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.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-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java?rev=819459&r1=819458&r2=819459&view=diff
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/builder/XmlSqlMapConfigParser.java
 Mon Sep 28 06:51:35 2009
@@ -111,7 +111,7 @@
     boolean cacheModelsEnabled = 
context.getBooleanAttribute("cacheModelsEnabled", true);
     config.setCacheEnabled(cacheModelsEnabled);
 
-    boolean useColumnLabel = context.getBooleanAttribute("useColumnLabel", 
true);
+    boolean useColumnLabel = context.getBooleanAttribute("useColumnLabel", 
false);
     config.setUseColumnLabel(useColumnLabel);
 
     boolean forceMultipleResultSetSupport = 
context.getBooleanAttribute("forceMultipleResultSetSupport", true);

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=819459&r1=819458&r2=819459&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
 Mon Sep 28 06:51:35 2009
@@ -414,9 +414,11 @@
           final CacheKey rowKey = createRowKey(nestedResultMap, rs);
           final boolean knownValue = rowValueCache.containsKey(rowKey);
           Object rowValue = getRowValue(rs, nestedResultMap, rowKey);
-          if (!knownValue && rowValue != null && rowValue != NO_VALUE) {
+          if (rowValue != null && rowValue != NO_VALUE) {
             if (collectionProperty != null && collectionProperty instanceof 
Collection) {
-              ((Collection) collectionProperty).add(rowValue);
+              if (!knownValue) {
+                ((Collection) collectionProperty).add(rowValue);
+              }
             } else {
               metaObject.setValue(resultMapping.getProperty(), rowValue);
             }