From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 8 Aug 2008 14:31:20 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45591 - NPE on start-up failur... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=504e2a9f68a519f998cd0450cd83e1b550a3a8c7;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45591 - NPE on start-up failure in some cases

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@683982 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/jk/server/JkMain.java b/java/org/apache/jk/server/JkMain.java
index d825669be..079ee9f96 100644
--- a/java/org/apache/jk/server/JkMain.java
+++ b/java/org/apache/jk/server/JkMain.java
@@ -676,9 +676,12 @@ public class JkMain implements MBeanRegistration
     }
 
     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();
+                }
             }
         }
     }