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/06/25 06:35:09 UTC
svn commit: r201717 - in /ibatis/trunk/java/mapper/mapper2: doc/release.txt
src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java
Author: cbegin
Date: Fri Jun 24 21:35:07 2005
New Revision: 201717
URL: http://svn.apache.org/viewcvs?rev=201717&view=rev
Log:
IBATIS-139
Nullified discriminator at end of result Map parsing to ensure that discriminator isn't applied to the wrong result maps.
Modified:
ibatis/trunk/java/mapper/mapper2/doc/release.txt
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java
Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/doc/release.txt?rev=201717&r1=201716&r2=201717&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/doc/release.txt (original)
+++ ibatis/trunk/java/mapper/mapper2/doc/release.txt Fri Jun 24 21:35:07 2005
@@ -2,6 +2,13 @@
Build Number: @buildNum@
------------------------------
+ 2.1.5 - June ??, 2004
+------------------------------
+
+ o Fixed IBATIS-136, groupBy not carried forward to extended result maps
+ o Fixed IBATIS-139, discriminator being applied to too many result maps
+
+------------------------------
2.1.0 - May 16, 2004
------------------------------
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java?rev=201717&r1=201716&r2=201717&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java Fri Jun 24 21:35:07 2005
@@ -288,7 +288,8 @@
vars.currentResultMap.setResultMappingList(vars.resultMappingList);
vars.currentResultMap.setDiscriminator(vars.discriminator);
-
+ vars.discriminator = null;
+
vars.client.getDelegate().addResultMap(vars.currentResultMap);
vars.errorCtx.setMoreInfo(null);