2000-12-27 Jeff Sturm <jeff.sturm@commerceone.com>

	* java/sql/DriverManager.java (getConnection): Don't set
	user/password properties if null.

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c6fb85ce9..a70fc4c01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-27  Jeff Sturm  <jeff.sturm@commerceone.com>
+
+	* java/sql/DriverManager.java (getConnection): Don't set user/password
+	properties if null.
+
 2000-12-27  Warren Levy  <warrenl@redhat.com>
 
 	* java/util/Calendar.java: Fix typo in comment.
diff --git a/java/sql/DriverManager.java b/java/sql/DriverManager.java
index 19d4e9ded..641bfe479 100644
--- a/java/sql/DriverManager.java
+++ b/java/sql/DriverManager.java
@@ -341,8 +341,10 @@ getConnection(String url, String user, String password) throws SQLException
 {
   Properties p = new Properties();
 
-  p.setProperty("user", user);
-  p.setProperty("password", password);
+  if (user != null)
+    p.setProperty("user", user);
+  if (password != null)
+    p.setProperty("password", password);
 
   return(getConnection(url, p));
 }