- FIX: connect() method modification to retain "mangled" url for conn…

…ection

- FIX: acceptsURL() method rework to avoid potentially invoking super method with null param

Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com>

postgis-jdbc/src/main/java/net/postgis/jdbc/DriverWrapper.java

@@ -154,7 +154,9 @@ private static TypesAdder loadTypesAdder(final String version) throws SQLExcepti
      * @see org.postgresql.Driver
      */
     public java.sql.Connection connect(String url, final Properties info) throws SQLException {
-        if (!acceptsURL(url)) {
+        if (acceptsURL(url)) {
+            url = mangleURL(url);
+        } else {
             return null;
         }
         Connection result = super.connect(url, info);
@@ -186,8 +188,12 @@ protected boolean useLW(final Connection result) {
      * @return true if this driver accepts the given URL
      */
     public boolean acceptsURL(String url) {
-        url = mangleURL(url);
-        return url != null && super.acceptsURL(url);
+        String mangledURL = mangleURL(url);
+        if (mangledURL == null) {
+            return false;
+        } else {
+            return super.acceptsURL(mangledURL);
+        }
     }