aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorJeff Sturm <jeff.sturm@commerceone.com>2000-12-28 22:21:36 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2000-12-28 22:21:36 +0000
commit4c58589f1a8e1af4a8ef37e8fb2a3d50239b592b (patch)
treeee0562a472396859acb3586854669d26e1b72ea8 /libjava
parent347d73aac2abf507677b10b82be47273c87049be (diff)
downloadgcc-4c58589f1a8e1af4a8ef37e8fb2a3d50239b592b.zip
gcc-4c58589f1a8e1af4a8ef37e8fb2a3d50239b592b.tar.gz
gcc-4c58589f1a8e1af4a8ef37e8fb2a3d50239b592b.tar.bz2
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
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/sql/DriverManager.java6
2 files changed, 9 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index abe880dd..2dcc45d 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 19d4e9d..641bfe4 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));
}