From f244f2d77e5f92c3af9a74f1960c272054cb139b Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 28 Dec 2008 23:46:49 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46298 Throw an exception if the driver doesn't support the supplied URL Based on a patch by Owen Jacobson git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@729809 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/realm/JDBCRealm.java | 4 ++++ java/org/apache/catalina/realm/LocalStrings.properties | 1 + 2 files changed, 5 insertions(+) diff --git a/java/org/apache/catalina/realm/JDBCRealm.java b/java/org/apache/catalina/realm/JDBCRealm.java index 949d0e0e6..7cd17d0a0 100644 --- a/java/org/apache/catalina/realm/JDBCRealm.java +++ b/java/org/apache/catalina/realm/JDBCRealm.java @@ -700,6 +700,10 @@ public class JDBCRealm if (connectionPassword != null) props.put("password", connectionPassword); dbConnection = driver.connect(connectionURL, props); + if (dbConnection == null) { + throw new SQLException(sm.getString( + "jdbcRealm.open.invalidurl",driverName, connectionURL)); + } dbConnection.setAutoCommit(false); return (dbConnection); diff --git a/java/org/apache/catalina/realm/LocalStrings.properties b/java/org/apache/catalina/realm/LocalStrings.properties index 03f5ecb57..88b42e4a5 100644 --- a/java/org/apache/catalina/realm/LocalStrings.properties +++ b/java/org/apache/catalina/realm/LocalStrings.properties @@ -53,6 +53,7 @@ jdbcRealm.exception=Exception performing authentication jdbcRealm.getPassword.exception=Exception retrieving password for "{0}" jdbcRealm.getRoles.exception=Exception retrieving roles for "{0}" jdbcRealm.open=Exception opening database connection +jdbcRealm.open.invalidurl=Driver "{0}" does not support the url "{1}" jndiRealm.authenticateFailure=Username {0} NOT successfully authenticated jndiRealm.authenticateSuccess=Username {0} successfully authenticated jndiRealm.close=Exception closing directory server connection -- 2.11.0