View | Details | Raw Unified | Return to bug 297042
Collapse All | Expand All

(-)DriverWrapper.java (-7 / +17 lines)
Lines 223-239 Link Here
223
            throw new SQLException(getDriverBrokenExceptionString());
223
            throw new SQLException(getDriverBrokenExceptionString());
224
        }
224
        }
225
        String decodedUrl = decodeUrl(url);
225
        String decodedUrl = decodeUrl(url);
226
        ConnectionWrapper conn = new ConnectionWrapper(getDriver().connect(decodedUrl, info));
226
        if(driverName != null) {
227
        connections.add(conn);
227
            ConnectionWrapper conn = new ConnectionWrapper(getDriver().connect(decodedUrl, info));
228
        return conn;
228
            connections.add(conn);
229
            return conn;
230
        } else {
231
            // non-initialized DriverWrapper should be ignored by DriverManager.
232
            return null;
233
        }
229
    }
234
    }
230
235
231
    public boolean acceptsURL(String url) throws SQLException {
236
    public boolean acceptsURL(String url) throws SQLException {
232
        if(driverBroken) {
237
        if(driverName != null) {
233
            throw new SQLException(getDriverBrokenExceptionString());
238
            if(driverBroken) {
239
                throw new SQLException(getDriverBrokenExceptionString());
240
            }
241
            String decodedUrl = decodeUrl(url);
242
            return getDriver().acceptsURL(decodedUrl);
243
        } else {
244
            // non-initialized DriverWrapper should be ignored by DriverManager.
245
            return false;
234
        }
246
        }
235
        String decodedUrl = decodeUrl(url);
236
        return getDriver().acceptsURL(decodedUrl);
237
    }
247
    }
238
248
239
    public DriverPropertyInfo[] getPropertyInfo(String url, java.util.Properties info) throws SQLException {
249
    public DriverPropertyInfo[] getPropertyInfo(String url, java.util.Properties info) throws SQLException {

Return to bug 297042