summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2000-12-28 22:21:36 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2000-12-28 22:21:36 +0000
commit6fb4175cbf9e4a9dc896fe9fba25311dded7e010 (patch)
treeee0562a472396859acb3586854669d26e1b72ea8 /libjava
parent5aeca23f8ca45c4f9b048d572856ba0b4c8567f9 (diff)
downloadppe42-gcc-6fb4175cbf9e4a9dc896fe9fba25311dded7e010.tar.gz
ppe42-gcc-6fb4175cbf9e4a9dc896fe9fba25311dded7e010.zip
2000-12-27 Jeff Sturm <jeff.sturm@commerceone.com>
* java/sql/DriverManager.java (getConnection): Don't set user/password properties if null. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38516 138bc75d-0d04-0410-961f-82ee72b054a4
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 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));
}
OpenPOWER on IntegriCloud