DriverManager.java (getDrivers): Handle case where driver's class loader is null.

	* java/sql/DriverManager.java (getDrivers): Handle case where
	driver's class loader is null.  From Corey Minyard.

From-SVN: r42745

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9113e23e8d52b96169f46d54408470bbad8cd658..9cb3eb711aa9d200a4b9a2c685569ae1fc19a60b 100644 (file)
--- 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 641bfe479c4dc44ec53837dd00d86e561af968a0..696facaff9c3fba2353050a203229ba361deb20f 100644 (file)
--- 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);
     }