You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2005/03/13 17:18:57 UTC
svn commit: r157336 - in incubator/ibatis/trunk/java/mapper/mapper2:
build/version.properties
src/com/ibatis/sqlmap/engine/mapping/result/BasicResultMap.java
src/com/ibatis/sqlmap/engine/scope/RequestScope.java
Author: cbegin
Date: Sun Mar 13 08:18:55 2005
New Revision: 157336
URL: http://svn.apache.org/viewcvs?view=rev&rev=157336
Log:
fixed iBATIS-79
Modified:
incubator/ibatis/trunk/java/mapper/mapper2/build/version.properties
incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/BasicResultMap.java
incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/scope/RequestScope.java
Modified: incubator/ibatis/trunk/java/mapper/mapper2/build/version.properties
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/java/mapper/mapper2/build/version.properties?view=diff&r1=157335&r2=157336
==============================================================================
--- incubator/ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ incubator/ibatis/trunk/java/mapper/mapper2/build/version.properties Sun Mar 13 08:18:55 2005
@@ -1,4 +1,4 @@
#Build version info
-#Sun Mar 13 08:55:14 MST 2005
-buildDate=2005/03/13 08\:55
-buildNum=552
+#Sun Mar 13 09:16:46 MST 2005
+buildDate=2005/03/13 09\:16
+buildNum=553
Modified: incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/BasicResultMap.java
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/BasicResultMap.java?view=diff&r1=157335&r2=157336
==============================================================================
--- incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/BasicResultMap.java (original)
+++ incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/BasicResultMap.java Sun Mar 13 08:18:55 2005
@@ -285,7 +285,7 @@
public Object setResultObjectValues(RequestScope request, Object resultObject, Object[] values) {
Object ukey = getUniqueKey(values);
- Map uniqueKeys = request.getUniqueKeys();
+ Map uniqueKeys = request.getUniqueKeys(this);
if (uniqueKeys != null && uniqueKeys.containsKey(ukey)) {
// Unique key is already known, so get the existing result object and process additional results.
@@ -299,7 +299,7 @@
if (ukey != null) {
if (uniqueKeys == null) {
uniqueKeys = new HashMap();
- request.setUniqueKeys(uniqueKeys);
+ request.setUniqueKeys(this, uniqueKeys);
}
uniqueKeys.put(ukey, resultObject);
}
Modified: incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/scope/RequestScope.java
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/scope/RequestScope.java?view=diff&r1=157335&r2=157336
==============================================================================
--- incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/scope/RequestScope.java (original)
+++ incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/scope/RequestScope.java Sun Mar 13 08:18:55 2005
@@ -22,6 +22,7 @@
import java.sql.ResultSet;
import java.util.Map;
+import java.util.HashMap;
/**
* Request based implementation of Scope interface
@@ -194,12 +195,18 @@
this.resultSet = resultSet;
}
- public Map getUniqueKeys() {
- return uniqueKeys;
+ public Map getUniqueKeys(ResultMap map) {
+ if (uniqueKeys == null) {
+ return null;
+ }
+ return (Map)uniqueKeys.get(map);
}
- public void setUniqueKeys(Map uniqueKeys) {
- this.uniqueKeys = uniqueKeys;
+ public void setUniqueKeys(ResultMap map, Map keys) {
+ if (uniqueKeys == null) {
+ uniqueKeys = new HashMap();
+ }
+ this.uniqueKeys.put(map, keys);
}
public boolean isRowDataFound() {