Author: rmannibucau
Date: Sat Oct 27 14:44:56 2012
New Revision: 1402801
URL: http://svn.apache.org/viewvc?rev=1402801&view=rev
Log:
avoiding NPE in tomcat datasource creator
Modified:
openejb/trunk/openejb/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
Modified:
openejb/trunk/openejb/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java?rev=1402801&r1=1402800&r2=1402801&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
Sat Oct 27 14:44:56 2012
@@ -149,6 +149,10 @@ public class TomEEDataSourceCreator exte
}
}
+ if (!converted.containsKey("Password")) {
+ converted.setProperty("password", "");
+ }
+
final String currentUrl = properties.getProperty("url");
if (currentUrl != null) {
try {
