0001244: Mariadb driver is chosen even though the MySQL driver is spe…

…cified
JumpMind · May 30, 2013 · 63cdfb9 · 63cdfb9
1 parent 3efd942
commit 63cdfb9
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/util/BasicDataSourceFactory.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/util/BasicDataSourceFactory.java
@@ -52,7 +52,14 @@ public static BasicDataSource create(TypedProperties properties,
                 Enumeration<Driver> drivers = DriverManager.getDrivers();
                 while (drivers.hasMoreElements()) {
                     Driver driver2 = (Driver) drivers.nextElement();
-                    if (!driver2.getClass().equals(driver.getClass())) {
+                    /* 
+                     * MySQL and Maria DB drivers cannot co-exist because
+                     * they use the same JDBC URL.
+                     */
+                    if ((driver.getClass().equals("com.mysql.jdbc.Driver") &&
+                            driver2.getClass().getName().equals("org.mariadb.jdbc.Driver")) ||
+                            (driver.getClass().equals("org.mariadb.jdbc.Driver") &&
+                                    driver2.getClass().getName().equals("com.mysql.jdbc.Driver"))) {
                         DriverManager.deregisterDriver(driver2);
                     }
                 }