svn commit: r640157 - /ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/ResultMap.java

[cbegin]

Author: cbegin
Date: Sat Mar 22 22:22:18 2008
New Revision: 640157

URL: http://svn.apache.org/viewvc?rev=640157&view=rev
Log:
fixed ibatis 406

Modified:
    
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/ResultMap.java

Modified: 
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/ResultMap.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/ResultMap.java?rev=640157&r1=640156&r2=640157&view=diff
==============================================================================
--- 
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/ResultMap.java
 (original)
+++ 
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/ResultMap.java
 Sat Mar 22 22:22:18 2008
@@ -358,11 +358,9 @@
   }
 
   public Object setResultObjectValues(StatementScope statementScope, Object 
resultObject, Object[] values) {
-
+    final String previousNestedKey = statementScope.getCurrentNestedKey();
     String ukey = (String)getUniqueKey(statementScope.getCurrentNestedKey(), 
values);
-
     Map uniqueKeys = statementScope.getUniqueKeys(this);
-
     statementScope.setCurrentNestedKey(ukey);
     if (uniqueKeys != null && uniqueKeys.containsKey(ukey)) {
       // Unique key is already known, so get the existing result object and 
process additional results.
@@ -386,6 +384,7 @@
       resultObject = NO_VALUE;
     }
 
+    statementScope.setCurrentNestedKey(previousNestedKey);
     return resultObject;
   }