svn commit: r812324 - /ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java

[cbegin]

Author: cbegin
Date: Tue Sep  8 02:36:28 2009
New Revision: 812324

URL: http://svn.apache.org/viewvc?rev=812324&view=rev
Log:
cleaned up instantiation of result loader registry

Modified:
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java?rev=812324&r1=812323&r2=812324&view=diff
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/NewResultSetHandler.java
 Tue Sep  8 02:36:28 2009
@@ -119,7 +119,7 @@
     skipRows(rs, rowLimit);
     while (shouldProcessMoreRows(rs, resultContext.getResultCount(), 
rowLimit)) {
       final ResultMap discriminatedResultMap = 
resolveDiscriminatedResultMap(rs, resultMap);
-      final ResultLoaderRegistry lazyLoader = new ResultLoaderRegistry();
+      final ResultLoaderRegistry lazyLoader = 
instantiateResultLoaderRegistry();
       final Object resultObject = createResultObject(rs, 
discriminatedResultMap, lazyLoader);
       final MetaObject metaObject = MetaObject.forObject(resultObject);
       getMappedAndUnmappedColumnNames(rs, discriminatedResultMap, 
mappedColumnNames, unmappedColumnNames);
@@ -130,6 +130,14 @@
     }
   }
 
+  private ResultLoaderRegistry instantiateResultLoaderRegistry() {
+    if (configuration.isLazyLoadingEnabled()) {
+      return new ResultLoaderRegistry();
+    } else {
+      return null;
+    }
+  }
+
   private boolean shouldProcessMoreRows(ResultSet rs, int count, RowLimit 
rowLimit) throws SQLException {
     return rs.next() && count < rowLimit.getLimit();
   }