You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2007/07/06 20:08:07 UTC
svn commit: r553978 -
/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
Author: mikedd
Date: Fri Jul 6 11:08:06 2007
New Revision: 553978
URL: http://svn.apache.org/viewvc?view=rev&rev=553978
Log:
OPENJPA-279
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?view=diff&rev=553978&r1=553977&r2=553978
==============================================================================
--- 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 Jul 6 11:08:06 2007
@@ -755,7 +755,8 @@
public Object getConnectionFactory2() {
// override to configure data source
if (dataSource2 == null) {
- DataSource ds = (DataSource) connectionFactory2.get();
+ // superclass will lookup from JNDI.
+ DataSource ds = (DataSource) super.getConnectionFactory2();
if (ds == null) {
// the driver name is always required, so if not specified,
// then no connection factory 2