Author: markt
Date: Wed May 12 10:29:06 2010
New Revision: 943434
URL: http://svn.apache.org/viewvc?rev=943434&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49224
Only try setting the username and password if they are non-null
Patch provided by Matt Passell
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=943434&r1=943433&r2=943434&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Wed May 12 10:29:06 2010
@@ -215,8 +215,13 @@ public class PooledConnection {
String driverURL = poolProperties.getUrl();
String usr = poolProperties.getUsername();
String pwd = poolProperties.getPassword();
- poolProperties.getDbProperties().setProperty("user", usr);
- poolProperties.getDbProperties().setProperty("password", pwd);
+ if (usr != null) {
+ poolProperties.getDbProperties().setProperty("user", usr);
+ }
+ if (pwd != null) {
+ poolProperties.getDbProperties().setProperty("password", pwd);
+ }
+
try {
connection = driver.connect(driverURL,
poolProperties.getDbProperties());
} catch (Exception x) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
