tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r689615 - in /tomcat: connectors/trunk/jk/java/org/apache/jk/server/JkMain.java container/tc5.5.x/webapps/docs/changelog.xml current/tc5.5.x/STATUS.txt
Date Wed, 27 Aug 2008 20:57:50 GMT
Author: markt
Date: Wed Aug 27 13:57:50 2008
New Revision: 689615

URL: http://svn.apache.org/viewvc?rev=689615&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45591
NPE on shutdown failure in some cases. Based on a patch by Matt Passell

Modified:
    tomcat/connectors/trunk/jk/java/org/apache/jk/server/JkMain.java
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml
    tomcat/current/tc5.5.x/STATUS.txt

Modified: tomcat/connectors/trunk/jk/java/org/apache/jk/server/JkMain.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/jk/server/JkMain.java?rev=689615&r1=689614&r2=689615&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/java/org/apache/jk/server/JkMain.java (original)
+++ tomcat/connectors/trunk/jk/java/org/apache/jk/server/JkMain.java Wed Aug 27 13:57:50 2008
@@ -676,9 +676,12 @@
     }
 
     public void pause() throws Exception {
-        for( int i=0; i<wEnv.getHandlerCount(); i++ ) {
-            if( wEnv.getHandler(i) != null ) {
-                wEnv.getHandler(i).pause();
+        // wEnv sometime null at shutdown - bug45591
+        if (wEnv != null) {
+            for( int i=0; i<wEnv.getHandlerCount(); i++ ) {
+                if( wEnv.getHandler(i) != null ) {
+                    wEnv.getHandler(i).pause();
+                }
             }
         }
     }

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=689615&r1=689614&r2=689615&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Aug 27 13:57:50 2008
@@ -131,6 +131,10 @@
         <bug>43191</bug>: Compression could not be disabled for some file types.
         Based on a patch by Len Popp. (markt)
       </fix>
+      <fix>
+        <bug>45591</bug>: Fix NPE on shutdown failure in some cases. Based on
a
+        patch by Matt Passell. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=689615&r1=689614&r2=689615&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Aug 27 13:57:50 2008
@@ -31,12 +31,6 @@
    0: fhanik - silently swallow an error, and default to the default config file, yoavs:
don't like silent swallowing
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45591
-  NPE on shutdown failure in some cases. Based on a patch by Matt Passell
-  http://svn.apache.org/viewvc?rev=683982&view=rev
-  +1: markt, fhanik, rjung
-  -1: 
-
 * JAASMemoryLoginModule didn't confirm to JAASRealm contract. This prevented any
   user from being assigned a role.
   http://svn.apache.org/viewvc?rev=684081&view=rev



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


Mime
View raw message