From fc23bccf0114aa77efd88c2034952e470bb849e2 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Thu, 16 Apr 2015 23:42:27 +0900
Subject: [PATCH] Fixed #308 try harder at resolving the driver by various
 means when driverClassName and jdbcUrl are both specified.

---
 .../src/main/java/com/zaxxer/hikari/util/DriverDataSource.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hikaricp-common/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java b/hikaricp-common/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java
index 1c718d3b..39af90cf 100644
--- a/hikaricp-common/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java
+++ b/hikaricp-common/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
 
 public final class DriverDataSource implements DataSource
 {
-   private final Logger LOGGER = LoggerFactory.getLogger(ConcurrentBag.class);
+   private final Logger LOGGER = LoggerFactory.getLogger(DriverDataSource.class);
 
    private final String jdbcUrl;
    private final Properties driverProperties;
@@ -60,6 +60,7 @@ public final class DriverDataSource implements DataSource
             Driver d = drivers.nextElement();
             if (d.getClass().getName().equals(driverClassName)) {
                this.driver = d;
+               break;
             }
          }