diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-31 16:18:55 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-31 16:18:55 +0000 |
| commit | 68c465c0f9568121e2bed7331b4dd09d92f05758 (patch) | |
| tree | b70c0b4db01147fb2a2842034bc2868eb14f9025 /libjava | |
| parent | 8878d5e46d4edcc706701f66d12dff79a5f51c0d (diff) | |
* java/sql/DriverManager.java (getDrivers): Handle case where
driver's class loader is null. From Corey Minyard.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42745 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/sql/DriverManager.java | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9113e23e8d5..9cb3eb711aa 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2001-05-31 Tom Tromey <tromey@redhat.com> + + * java/sql/DriverManager.java (getDrivers): Handle case where + driver's class loader is null. From Corey Minyard. + 2001-05-29 Tom Tromey <tromey@redhat.com> * include/jvm.h (_Jv_ThrowNoMemory): Mark as noreturn. diff --git a/libjava/java/sql/DriverManager.java b/libjava/java/sql/DriverManager.java index 641bfe479c4..696facaff9c 100644 --- a/libjava/java/sql/DriverManager.java +++ b/libjava/java/sql/DriverManager.java @@ -1,5 +1,5 @@ /* DriverManager.java -- Manage JDBC drivers - Copyright (C) 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -264,8 +264,13 @@ getDrivers() while(e.hasMoreElements()) { Object obj = e.nextElement(); - if (!obj.getClass().getClassLoader().equals(cl)) - continue; + + ClassLoader loader = obj.getClass().getClassLoader(); + + if (loader == null) + loader = ClassLoader.getSystemClassLoader(); + if (!loader.equals(cl)) + continue; v.addElement(obj); } |