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

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

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

From-SVN: r38516

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index abe880dd8a8b076ca343a378ca6f87d5b63c7598..2dcc45d33f33f9dc9f38815c401e7bae71be1026 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/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>
 
        Fix for PR libgcj/1358:

diff --git a/libjava/java/sql/DriverManager.java b/libjava/java/sql/DriverManager.java
index 19d4e9ded4de692004c96ac72c3673aa95cf8311..641bfe479c4dc44ec53837dd00d86e561af968a0 100644 (file)
--- a/libjava/java/sql/DriverManager.java
+++ b/libjava/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));
 }