procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

From-SVN: r42745
This commit is contained in:
Tom Tromey 2001-05-31 16:18:55 +00:00 • committed by Tom Tromey
parent bfa1e6b11b
commit 5980a00aeb
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -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.

11
libjava/java/sql/DriverManager.java
View file

@ -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);
}