You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2003/08/17 10:36:14 UTC

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader LocalStrings.properties WebappClassLoader.java

remm        2003/08/17 01:36:14

  Modified:    catalina/src/share/org/apache/catalina/loader
                        LocalStrings.properties WebappClassLoader.java
  Log:
  - Improve error message, so that it is more explanatory.
  
  Revision  Changes    Path
  1.2       +1 -0      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/LocalStrings.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocalStrings.properties	18 Jul 2002 16:48:03 -0000	1.1
  +++ LocalStrings.properties	17 Aug 2003 08:36:14 -0000	1.2
  @@ -13,6 +13,7 @@
   standardLoader.removeRepository=Removing repository {0}
   standardLoader.starting=Starting this Loader
   standardLoader.stopping=Stopping this Loader
  +webappClassLoader.stopped=Illegal access: this web application instance has been stopped already (the eventual following stack trace is caused by an error thrown for debugging purposes as well as to attempt to terminate the thread which caused the illegal access, and has no functional impact)
   webappLoader.addRepository=Adding repository {0}
   webappLoader.deploy=Deploying class repositories to work directory {0}
   webappLoader.jarDeploy=Deploy JAR {0} to {1}
  
  
  
  1.19      +12 -3     jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
  
  Index: WebappClassLoader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- WebappClassLoader.java	6 Aug 2003 08:58:19 -0000	1.18
  +++ WebappClassLoader.java	17 Aug 2003 08:36:14 -0000	1.19
  @@ -99,10 +99,12 @@
   import javax.naming.NameClassPair;
   
   import org.apache.tomcat.util.compat.JdkCompat;
  +
   import org.apache.catalina.Lifecycle;
   import org.apache.catalina.LifecycleEvent;
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.LifecycleListener;
  +import org.apache.catalina.util.StringManager;
   
   import org.apache.naming.JndiPermission;
   import org.apache.naming.resources.ResourceAttributes;
  @@ -205,6 +207,13 @@
       };
   
   
  +    /**
  +     * The string manager for this package.
  +     */
  +    protected static final StringManager sm =
  +        StringManager.getManager(Constants.Package);
  +
  +
       // ----------------------------------------------------------- Constructors
   
   
  @@ -1247,7 +1256,7 @@
   
           // Don't load classes if class loader is stopped
           if (!started) {
  -            log.debug("Lifecycle error : CL stopped");
  +            log.info(sm.getString("webappClassLoader.stopped"));
               throw new IncompatibleClassChangeError(name);
           }
   
  @@ -1691,7 +1700,7 @@
       protected ResourceEntry findResourceInternal(String name, String path) {
   
           if (!started) {
  -            log.info("Lifecycle error : CL stopped");
  +            log.info(sm.getString("webappClassLoader.stopped"));
               return null;
           }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org