[CONJ-188] Default pool framework initialisation data

mariadb-corporation · Aug 31, 2015 · 0447a87 · 0447a87
1 parent 96a4d49
commit 0447a87
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/JDBCUrl.java b/src/main/java/org/mariadb/jdbc/JDBCUrl.java
@@ -146,8 +146,15 @@ public static JDBCUrl parse(final String url, Properties prop) throws SQLExcepti
     }
 
     public void parseUrl(String url) throws SQLException {
-        if (!url.startsWith("jdbc:mysql:")) throw new IllegalArgumentException("Url must start with \"jdbc:mysql:\"");
-        parseInternal(this, url, new Properties());
+        if (url.startsWith("jdbc:mysql:")) {
+            parseInternal(this, url, new Properties());
+        }
+        String[] arr = new String[]{"jdbc:mysql:thin:", "jdbc:mariadb:"};
+        for (String prefix : arr) {
+            if (url.startsWith(prefix)) {
+                parseInternal(this, url, new Properties());
+            }
+        }
     }
 
     /*

diff --git a/src/main/java/org/mariadb/jdbc/MySQLDataSource.java b/src/main/java/org/mariadb/jdbc/MySQLDataSource.java
@@ -194,7 +194,9 @@ public int getPort() {
      * @see #setPort
      */
     public void setPortNumber(int p) {
-        setPort(p);
+        if (p > 0) {
+            setPort(p);
+        }
     }
 
     /**
@@ -213,7 +215,9 @@ public int getPortNumber() {
      *            the server name
      */
     public void setServerName(String serverName) {
-        jdbcUrl.getHostAddresses().get(0).host = serverName;
+        if (serverName != null && !serverName.isEmpty()) {
+            jdbcUrl.getHostAddresses().get(0).host = serverName;
+        }
     }
 
     public void setProperties(String properties) {