remm        01/06/22 10:29:22

  Modified:    catalina/src/share/org/apache/catalina/loader
                        WebappClassLoader.java
  Log:
  - Forgot to rename StandardClassLoader -> WebappClassLoader.
  
  Revision  Changes    Path
  1.3       +12 -12    
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
  
  Index: WebappClassLoader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WebappClassLoader.java    2001/06/19 17:37:23     1.2
  +++ WebappClassLoader.java    2001/06/22 17:29:22     1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
 1.2 2001/06/19 17:37:23 remm Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/06/19 17:37:23 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
 1.3 2001/06/22 17:29:22 remm Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/06/22 17:29:22 $
    *
    * ====================================================================
    *
  @@ -117,7 +117,7 @@
    *
    * @author Remy Maucherat
    * @author Craig R. McClanahan
  - * @version $Revision: 1.2 $ $Date: 2001/06/19 17:37:23 $
  + * @version $Revision: 1.3 $ $Date: 2001/06/22 17:29:22 $
    */
   public class WebappClassLoader
       extends URLClassLoader
  @@ -576,10 +576,10 @@
            loader = loader.getParent();
            if (loader == null)        
                break;        
  -         if (!(loader instanceof StandardClassLoader))
  +         if (!(loader instanceof WebappClassLoader))
                continue;
               Extension extensions[] =
  -                ((StandardClassLoader) loader).findAvailable();
  +                ((WebappClassLoader) loader).findAvailable();
               for (int i = 0; i < extensions.length; i++)
                   results.add(extensions[i]);
           }
  @@ -623,10 +623,10 @@
            loader = loader.getParent();
               if (loader == null)
                   break;
  -            if (!(loader instanceof StandardClassLoader))
  +            if (!(loader instanceof WebappClassLoader))
                   continue;
               Extension extensions[] =
  -                ((StandardClassLoader) loader).findRequired();
  +                ((WebappClassLoader) loader).findRequired();
               for (int i = 0; i < extensions.length; i++)
                   results.add(extensions[i]);
           }
  @@ -717,7 +717,7 @@
        */
       public String toString() {
   
  -        StringBuffer sb = new StringBuffer("StandardClassLoader\r\n");
  +        StringBuffer sb = new StringBuffer("WebappClassLoader\r\n");
           sb.append("  available:\r\n");
           Iterator available = this.available.iterator();
           while (available.hasNext()) {
  @@ -1187,7 +1187,7 @@
   
       /**
        * Get the Permissions for a CodeSource.  If this instance
  -     * of StandardClassLoader is for a web application context,
  +     * of WebappClassLoader is for a web application context,
        * add read FilePermissions for the base directory (if unpacked),
        * the context URL, and jar file resources.
        *
  @@ -1556,7 +1556,7 @@
        */
       private void log(String message) {
   
  -     System.out.println("StandardClassLoader: " + message);
  +     System.out.println("WebappClassLoader: " + message);
   
       }
   
  @@ -1569,7 +1569,7 @@
        */
       private void log(String message, Throwable throwable) {
   
  -     System.out.println("StandardClassLoader: " + message);
  +     System.out.println("WebappClassLoader: " + message);
        throwable.printStackTrace(System.out);
   
       }
  
  
  

Reply via email to