tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/res LocalStrings.properties
Date Thu, 06 Nov 2003 19:05:23 GMT
luehe       2003/11/06 11:05:23

  Modified:    util/java/org/apache/tomcat/util/threads ThreadPool.java
               util/java/org/apache/tomcat/util/threads/res
                        LocalStrings.properties
  Log:
  More i18n: added 'threadpool.thread_error' error code
  
  Revision  Changes    Path
  1.18      +6 -5      jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPool.java
  
  Index: ThreadPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPool.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ThreadPool.java	6 Nov 2003 18:23:20 -0000	1.17
  +++ ThreadPool.java	6 Nov 2003 19:05:23 -0000	1.18
  @@ -647,7 +647,7 @@
             try {
               while(true) {
                   try {
  -		            /* Wait for work. */
  +                    /* Wait for work. */
                       synchronized(this) {
                           if(!shouldRun && !shouldTerminate) {
                               this.wait();
  @@ -683,8 +683,9 @@
                               }
                           }
                       } catch(Throwable t) {
  -			p.log.error("Caught exception executing " + toRun.toString() + ", terminating thread",
t);
  -                        /*
  +			p.log.error(sm.getString("threadpool.thread_error",
  +                                                 t, toRun.toString()));
  +                       /*
                           * The runnable throw an exception (can be even a ThreadDeath),
                           * signalling that the thread die.
                           *
  @@ -698,8 +699,8 @@
                           if(shouldRun) {
                               shouldRun = false;
                               /*
  -			                * Notify the pool that the thread is now idle.
  -                            */
  +			     * Notify the pool that the thread is now idle.
  +                             */
                               p.returnController(this);
                           }
                       }
  
  
  
  1.3       +2 -1      jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/res/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/res/LocalStrings.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LocalStrings.properties	3 Nov 2003 21:54:24 -0000	1.2
  +++ LocalStrings.properties	6 Nov 2003 19:05:23 -0000	1.3
  @@ -1,2 +1,3 @@
   threadpool.busy=All threads ({0}) are currently busy, waiting. Increase maxThreads ({1})
or check the servlet status
  -threadpool.max_threads_too_low=maxThreads setting ({0}) too low, set to {1}
  \ No newline at end of file
  +threadpool.max_threads_too_low=maxThreads setting ({0}) too low, set to {1}
  +threadpool.thread_error=Caught exception ({0}) executing {1}, terminating thread
  
  
  

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


Mime
View raw message