You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/10/31 16:02:37 UTC
svn commit: r1537522 -
/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java
Author: sebb
Date: Thu Oct 31 15:02:37 2013
New Revision: 1537522
URL: http://svn.apache.org/r1537522
Log:
Don't hide field name
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java?rev=1537522&r1=1537521&r2=1537522&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/BasicDataSource.java Thu Oct 31 15:02:37 2013
@@ -1735,10 +1735,10 @@ public class BasicDataSource implements
*/
protected ConnectionFactory createConnectionFactory() throws SQLException {
// Load the JDBC driver class
- Class<Driver> driverFromCCL = null;
- Driver driver = this.driver;
+ Driver driverToUse = this.driver;
- if (driver == null) {
+ if (driverToUse == null) {
+ Class<Driver> driverFromCCL = null;
if (driverClassName != null) {
try {
try {
@@ -1771,12 +1771,12 @@ public class BasicDataSource implements
try {
if (driverFromCCL == null) {
- driver = DriverManager.getDriver(url);
+ driverToUse = DriverManager.getDriver(url);
} else {
// Usage of DriverManager is not possible, as it does not
// respect the ContextClassLoader
- driver = driverFromCCL.newInstance();
- if (!driver.acceptsURL(url)) {
+ driverToUse = driverFromCCL.newInstance();
+ if (!driverToUse.acceptsURL(url)) {
throw new SQLException("No suitable driver", "08001");
}
}
@@ -1813,7 +1813,7 @@ public class BasicDataSource implements
}
ConnectionFactory driverConnectionFactory =
- new DriverConnectionFactory(driver, url, connectionProperties);
+ new DriverConnectionFactory(driverToUse, url, connectionProperties);
return driverConnectionFactory;
}