Allow null usernames and passwords to be passed in, so that one can call DataSource...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@893577 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/jdbc-pool/build.properties.default b/modules/jdbc-pool/build.properties.default
index 2518c54..a16f5ce 100644 (file)
--- a/modules/jdbc-pool/build.properties.default
+++ b/modules/jdbc-pool/build.properties.default
@@ -28,7 +28,7 @@
 version.major=1
 version.minor=0
 version.build=8
-version.patch=.1
+version.patch=.2
 version.suffix=
 
 # ----- Default Base Path for Dependent Packages -----

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
index 150b917..7de726a 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
@@ -385,8 +385,12 @@ public class DataSourceFactory implements ObjectFactory {
             poolProperties.setDbProperties(new Properties());
         }
 
-        poolProperties.getDbProperties().setProperty("user",poolProperties.getUsername());
-        poolProperties.getDbProperties().setProperty("password",poolProperties.getPassword());
+        if (poolProperties.getUsername()!=null) {
+            poolProperties.getDbProperties().setProperty("user",poolProperties.getUsername());
+        }
+        if (poolProperties.getPassword()!=null) {
+            poolProperties.getDbProperties().setProperty("password",poolProperties.getPassword());
+        }
 
         value = properties.getProperty(PROP_INITSQL);
         if (value != null) {