Author: cbegin
Date: Sun Oct 4 04:58:52 2009
New Revision: 821468
URL: http://svn.apache.org/viewvc?rev=821468&view=rev
Log:
Fixed IBATIS-636 Changing the Environment does not change the
SqlSessionFactory's fields
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSessionFactory.java
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSessionFactory.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSessionFactory.java?rev=821468&r1=821467&r2=821468&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSessionFactory.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/session/defaults/DefaultSqlSessionFactory.java
Sun Oct 4 04:58:52 2009
@@ -52,11 +52,10 @@
}
private DataSource getDataSourceFromEnvironment(Environment environment) {
- final DataSource dataSource = environment.getDataSource();
- if (dataSource == null) {
+ if (environment == null || environment.getDataSource() == null) {
throw new SessionException("Configuration does not include an
environment with a DataSource, so session cannot be created unless a connection
is passed in.");
}
- return dataSource;
+ return environment.getDataSource();
}
private TransactionFactory getTransactionFactoryFromEnvironment(Environment
environment) {
