Author: kai
Date: Tue May 12 18:24:00 2009
New Revision: 774012
URL: http://svn.apache.org/viewvc?rev=774012&view=rev
Log:
IBATIS-436 (Defaults for <settings/> element aren't applied if it doesn't exist)
- corrected implemented: changed default values of lazyLoadingEnabled,
cacheModelsEnabled and statementCacheEnabled to true if no <settings /> element
present in sqlmap config (in order to be in line with documentation)
Modified:
ibatis/trunk/java/ibatis-2/ibatis-2-core/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java
Modified:
ibatis/trunk/java/ibatis-2/ibatis-2-core/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-2/ibatis-2-core/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java?rev=774012&r1=774011&r2=774012&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-2/ibatis-2-core/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java
(original)
+++
ibatis/trunk/java/ibatis-2/ibatis-2-core/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java
Tue May 12 18:24:00 2009
@@ -15,6 +15,15 @@
*/
package com.ibatis.sqlmap.engine.impl;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
import com.ibatis.common.beans.Probe;
import com.ibatis.common.beans.ProbeFactory;
import com.ibatis.common.jdbc.exception.NestedSQLException;
@@ -25,8 +34,8 @@
import com.ibatis.sqlmap.engine.cache.CacheModel;
import com.ibatis.sqlmap.engine.exchange.DataExchangeFactory;
import com.ibatis.sqlmap.engine.execution.BatchException;
-import com.ibatis.sqlmap.engine.execution.SqlExecutor;
import com.ibatis.sqlmap.engine.execution.DefaultSqlExecutor;
+import com.ibatis.sqlmap.engine.execution.SqlExecutor;
import com.ibatis.sqlmap.engine.mapping.parameter.ParameterMap;
import com.ibatis.sqlmap.engine.mapping.result.ResultMap;
import com.ibatis.sqlmap.engine.mapping.result.ResultObjectFactory;
@@ -34,8 +43,8 @@
import com.ibatis.sqlmap.engine.mapping.statement.MappedStatement;
import com.ibatis.sqlmap.engine.mapping.statement.PaginatedDataList;
import com.ibatis.sqlmap.engine.mapping.statement.SelectKeyStatement;
-import com.ibatis.sqlmap.engine.scope.StatementScope;
import com.ibatis.sqlmap.engine.scope.SessionScope;
+import com.ibatis.sqlmap.engine.scope.StatementScope;
import com.ibatis.sqlmap.engine.transaction.Transaction;
import com.ibatis.sqlmap.engine.transaction.TransactionException;
import com.ibatis.sqlmap.engine.transaction.TransactionManager;
@@ -43,14 +52,6 @@
import com.ibatis.sqlmap.engine.transaction.user.UserProvidedTransaction;
import com.ibatis.sqlmap.engine.type.TypeHandlerFactory;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
/**
* The workhorse that really runs the SQL
*/
@@ -58,9 +59,9 @@
private static final Probe PROBE = ProbeFactory.getProbe();
- private boolean lazyLoadingEnabled;
- private boolean cacheModelsEnabled;
- private boolean enhancementEnabled;
+ private boolean lazyLoadingEnabled=true;
+ private boolean cacheModelsEnabled=true;
+ private boolean enhancementEnabled=false;
private boolean useColumnLabel = true;
private boolean forceMultipleResultSetSupport;
@@ -76,7 +77,7 @@
private DataExchangeFactory dataExchangeFactory;
private ResultObjectFactory resultObjectFactory;
- private boolean statementCacheEnabled;
+ private boolean statementCacheEnabled=true;
/**
* Default constructor
