Author: fhanik
Date: Wed Dec 23 17:12:10 2009
New Revision: 893577
URL: http://svn.apache.org/viewvc?rev=893577&view=rev
Log:
Allow null usernames and passwords to be passed in, so that one can call
DataSource.getConnection()
Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=893577&r1=893576&r2=893577&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Wed Dec 23 17:12:10
2009
@@ -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 -----
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=893577&r1=893576&r2=893577&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
Wed Dec 23 17:12:10 2009
@@ -385,8 +385,12 @@
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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
