Apache/openjpa
1
0
Fork 0
mirror of https://github.com/apache/openjpa.git synced 2025-03-08 17:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-1568: Make createConnectionFactory() in JDBCConfigurationImpl public

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@922441 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Catalina Wei 2010-03-12 22:31:45 +00:00
parent e2df6f49e4
commit 8f45b5bf0b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
View File

@ -823,16 +823,20 @@ public class JDBCConfigurationImpl
*/
public DecoratingDataSource createConnectionFactory() {
DataSource ds = (DataSource) connectionFactory.get();
if (ds != null)
Log log = getLog(LOG_JDBC);
if (ds != null) {
if (log.isTraceEnabled())
log.trace("createConnectionFactory: DataSource:"+ds);
return setupConnectionFactory(ds, false);
}
ds = (DataSource) super.getConnectionFactory(); // JNDI lookup
if (ds == null)
ds = DataSourceFactory.newDataSource(this, false);
Log log = getLog(LOG_JDBC);
if (log.isTraceEnabled())
log.trace("createConnectionFactory: datasource="+ds);
log.trace("createConnectionFactory: DataSource="+ds);
return setupConnectionFactory(ds, false);
}