svn commit: r922441 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java

[fancy]

Author: fancy
Date: Fri Mar 12 22:31:45 2010
New Revision: 922441

URL: http://svn.apache.org/viewvc?rev=922441&view=rev
Log:
OPENJPA-1568: Make createConnectionFactory() in JDBCConfigurationImpl public

Modified:
    
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java

Modified: 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java?rev=922441&r1=922440&r2=922441&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
 (original)
+++ 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
 Fri Mar 12 22:31:45 2010
@@ -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);
     }