/[classpath]/classpath/java/lang/ClassLoader.java
ViewVC logotype

Diff of /classpath/java/lang/ClassLoader.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.47 by mkoch, Wed Feb 16 11:18:37 2005 UTC revision 1.48 by tromey, Mon Mar 28 23:47:36 2005 UTC
# Line 321  public abstract class ClassLoader Line 321  public abstract class ClassLoader
321    {    {
322      // Have we already loaded this class?      // Have we already loaded this class?
323      Class c = findLoadedClass(name);      Class c = findLoadedClass(name);
324      if (c != null)      if (c == null)
       return c;  
   
     // Can the class be loaded by a parent?  
     try  
325        {        {
326          if (parent == null)          // Can the class be loaded by a parent?
327            try
328            {            {
329              c = VMClassLoader.loadClass(name, resolve);              if (parent == null)
330              if (c != null)                {
331                return c;                  c = VMClassLoader.loadClass(name, resolve);
332                    if (c != null)
333                      return c;
334                  }
335                else
336                  {
337                    return parent.loadClass(name, resolve);
338                  }
339            }            }
340          else          catch (ClassNotFoundException e)
341            {            {
             return parent.loadClass(name, resolve);  
342            }            }
343            // Still not found, we have to do it ourself.
344            c = findClass(name);
345        }        }
     catch (ClassNotFoundException e)  
       {  
       }  
     // Still not found, we have to do it ourself.  
     c = findClass(name);  
346      if (resolve)      if (resolve)
347        resolveClass(c);        resolveClass(c);
348      return c;      return c;

Legend:
Removed from v.1.47  
changed lines
  Added in v.1.48

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26