Author: cbegin
Date: Tue Sep  8 02:27:53 2009
New Revision: 812322

URL: http://svn.apache.org/viewvc?rev=812322&view=rev
Log:
matched constructors of default and new result handlers

Modified:
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.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=812322&r1=812321&r2=812322&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
 Tue Sep  8 02:27:53 2009
@@ -29,8 +29,8 @@
   private final NestedResultSetHandler nestedResultSetHandler;
   private final DiscriminatorHandler discriminatorHandler;
 
-  public DefaultResultSetHandler(Configuration configuration, Executor 
executor, MappedStatement mappedStatement, ParameterHandler parameterHandler, 
int rowOffset, int rowLimit, ResultHandler resultHandler, BoundSql boundSql) {
-    this.configuration = configuration;
+  public DefaultResultSetHandler(Executor executor, MappedStatement 
mappedStatement, ParameterHandler parameterHandler, ResultHandler 
resultHandler, BoundSql boundSql, int rowOffset, int rowLimit) {
+    this.configuration = mappedStatement.getConfiguration();
     this.objectFactory = mappedStatement.getConfiguration().getObjectFactory();
     this.typeHandlerRegistry = 
mappedStatement.getConfiguration().getTypeHandlerRegistry();
     this.mappedStatement = mappedStatement;

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java?rev=812322&r1=812321&r2=812322&view=diff
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
 Tue Sep  8 02:27:53 2009
@@ -173,7 +173,8 @@
   }
 
   public ResultSetHandler newResultSetHandler(Executor executor, 
MappedStatement mappedStatement, int rowOffset, int rowLimit, ParameterHandler 
parameterHandler, ResultHandler resultHandler, BoundSql boundSql) {
-    ResultSetHandler resultSetHandler = new NewResultSetHandler(executor, 
mappedStatement, parameterHandler, resultHandler, boundSql, rowOffset, 
rowLimit);
+    ResultSetHandler defaultResultSetHandler = new 
DefaultResultSetHandler(executor, mappedStatement, parameterHandler, 
resultHandler, boundSql, rowOffset, rowLimit);
+    ResultSetHandler resultSetHandler =            new 
NewResultSetHandler(executor, mappedStatement, parameterHandler, resultHandler, 
boundSql, rowOffset, rowLimit);
     resultSetHandler = (ResultSetHandler) 
interceptorChain.pluginAll(resultSetHandler);
     return resultSetHandler;
   }


Reply via email to