Skip to content

Commit aa9533f

Browse files
committed
Better variable name.
1 parent efe5691 commit aa9533f

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class UnpooledDataSource implements DataSource {
3535

3636
private ClassLoader driverClassLoader;
3737
private Properties driverProperties;
38-
private static Map<String, Driver> driverCache = new ConcurrentHashMap<String, Driver>();
38+
private static Map<String, Driver> registeredDrivers = new ConcurrentHashMap<String, Driver>();
3939

4040
private String driver;
4141
private String url;
@@ -49,7 +49,7 @@ public class UnpooledDataSource implements DataSource {
4949
Enumeration<Driver> drivers = DriverManager.getDrivers();
5050
while (drivers.hasMoreElements()) {
5151
Driver driver = drivers.nextElement();
52-
driverCache.put(driver.getClass().getName(), driver);
52+
registeredDrivers.put(driver.getClass().getName(), driver);
5353
}
5454
}
5555

@@ -191,18 +191,19 @@ private Connection doGetConnection(Properties properties) throws SQLException {
191191
}
192192

193193
private synchronized void initializeDriver() throws SQLException {
194-
if (!driverCache.containsKey(driver)) {
194+
if (!registeredDrivers.containsKey(driver)) {
195195
Class<?> driverType;
196196
try {
197197
if (driverClassLoader != null) {
198198
driverType = Class.forName(driver, true, driverClassLoader);
199199
} else {
200200
driverType = Resources.classForName(driver);
201201
}
202+
// DriverManager requires the driver to be loaded via the system ClassLoader.
202203
// http://www.kfu.com/~nsayer/Java/dyn-jdbc.html
203204
Driver driverInstance = (Driver)driverType.newInstance();
204205
DriverManager.registerDriver(new DriverProxy(driverInstance));
205-
driverCache.put(driver, driverInstance);
206+
registeredDrivers.put(driver, driverInstance);
206207
} catch (Exception e) {
207208
throw new SQLException("Error setting driver on UnpooledDataSource. Cause: " + e);
208209
}

0 commit comments

Comments
 (0)