Author: fhanik
Date: Thu Jul 24 10:57:26 2014
New Revision: 1613066
URL: http://svn.apache.org/r1613066
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53198
driverClassName should not be mandatory
https://issues.apache.org/bugzilla/show_bug.cgi?id=53198
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1613066&r1=1613065&r2=1613066&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Thu Jul 24 10:57:26 2014
@@ -17,6 +17,7 @@
package org.apache.tomcat.jdbc.pool;
+import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.HashMap;
@@ -242,9 +243,13 @@ public class PooledConnection {
if (log.isDebugEnabled()) {
log.debug("Instantiating driver using class:
"+poolProperties.getDriverClassName()+" [url="+poolProperties.getUrl()+"]");
}
- driver = (java.sql.Driver)
Class.forName(poolProperties.getDriverClassName(),
- true,
PooledConnection.class.getClassLoader()
- ).newInstance();
+ if (poolProperties.getDriverClassName()==null) {
+ //rely on DriverManager
+ log.warn("Not loading a JDBC driver as driverClassName
property is null.");
+ } else {
+ driver = (java.sql.Driver)
Class.forName(poolProperties.getDriverClassName(),
+ true,
PooledConnection.class.getClassLoader()).newInstance();
+ }
}
} catch (java.lang.Exception cn) {
if (log.isDebugEnabled()) {
@@ -274,7 +279,11 @@ public class PooledConnection {
if (pwd != null) properties.setProperty(PROP_PASSWORD, pwd);
try {
- connection = driver.connect(driverURL, properties);
+ if (driver==null) {
+ connection = DriverManager.getConnection(driverURL, properties);
+ } else {
+ connection = driver.connect(driverURL, properties);
+ }
} catch (Exception x) {
if (log.isDebugEnabled()) {
log.debug("Unable to connect to database.", x);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
