svn commit: r427389 - /incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java

[mp...@apache.org]

Author: mprudhom
Date: Mon Jul 31 17:55:41 2006
New Revision: 427389

URL: http://svn.apache.org/viewvc?rev=427389&view=rev
Log:
Null check before we put username/password values in the Properties object, since null values are illegal.

Modified:
    incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java

Modified: incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java?rev=427389&r1=427388&r2=427389&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java (original)
+++ incubator/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java Mon Jul 31 17:55:41 2006
@@ -81,10 +81,17 @@
         throws SQLException {
         Properties props = new Properties();
 
-        props.put("user",
-            username != null ? username : _connectionUserName);
-        props.put("password",
-            password != null ? password : _connectionPassword);
+        if (username == null)
+            username = _connectionUserName;
+
+        if (username != null)
+            props.put("user", username);
+
+        if (password == null)
+            password = _connectionPassword;
+
+        if (password != null)
+            props.put("password", password);
 
         return getConnection(props);
     }