Author: markt
Date: Sun Dec 28 15:46:49 2008
New Revision: 729809
URL: http://svn.apache.org/viewvc?rev=729809&view=rev
Log:
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
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=729809&r1=729808&r2=729809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Sun Dec 28
15:46:49 2008
@@ -700,6 +700,10 @@
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);
Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=729809&r1=729808&r2=729809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties Sun Dec
28 15:46:49 2008
@@ -53,6 +53,7 @@
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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
