From: Jeff Sturm <jeff.sturm@commerceone.com>
Date: Thu, 28 Dec 2000 22:21:36 +0000 (+0000)
Subject: DriverManager.java (getConnection): Don't set user/password properties if null.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4c58589f1a8e1af4a8ef37e8fb2a3d50239b592b;p=gcc.git

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 abe880dd8a8..2dcc45d33f3 100644
--- 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 19d4e9ded4d..641bfe479c4 100644
--- 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));
 }