OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ClassLoader.java (loadClass): Resolve class even if it was already found. 

* java/lang/ClassLoader.java (loadClass): Resolve class even if
	it was already found.

From-SVN: r97565
This commit is contained in:
Tom Tromey 2005-04-04 18:40:24 +00:00 committed by Tom Tromey
parent d4e1591f4a
commit 6a5d24d70d
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2005-04-04 Tom Tromey <tromey@redhat.com>
* java/lang/ClassLoader.java (loadClass): Resolve class even if
it was already found.
2005-04-04 Tom Tromey <tromey@redhat.com>
* java/net/URL.java (DEFAULT_SEARCH_PATH): Added

32
libjava/java/lang/ClassLoader.java
View File

@ -285,28 +285,28 @@ public abstract class ClassLoader
{
// Have we already loaded this class?
Class c = findLoadedClass(name);
if (c != null)
return c;
// Can the class be loaded by a parent?
try
if (c == null)
{
if (parent == null)
// Can the class be loaded by a parent?
try
{
c = VMClassLoader.loadClass(name, resolve);
if (c != null)
return c;
if (parent == null)
{
c = VMClassLoader.loadClass(name, resolve);
if (c != null)
return c;
}
else
{
return parent.loadClass(name, resolve);
}
}
else
catch (ClassNotFoundException e)
{
return parent.loadClass(name, resolve);
}
// Still not found, we have to do it ourself.
c = findClass(name);
}
catch (ClassNotFoundException e)
{
}
// Still not found, we have to do it ourself.
c = findClass(name);
if (resolve)
resolveClass(c);
return c;