From 68c465c0f9568121e2bed7331b4dd09d92f05758 Mon Sep 17 00:00:00 2001 From: tromey Date: Thu, 31 May 2001 16:18:55 +0000 Subject: * 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 --- libjava/java/sql/DriverManager.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'libjava/java/sql') 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); } -- cgit v1.2.3