From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 17 Sep 2010 16:30:54 +0000 (+0000)
Subject: Also handle NPEs (seen during testing of new async re-factoring) and ignore them... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1627dcc6802d4bb7ff871b7715af690ca3e7e7b0;p=tomcat7.0

Also handle NPEs (seen during testing of new async re-factoring) and ignore them if the endpoint is shutting down.

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

diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java
index 3726c6a92..8371449f8 100644
--- a/java/org/apache/tomcat/util/net/JIoEndpoint.java
+++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java
@@ -193,18 +193,20 @@ public class JIoEndpoint extends AbstractEndpoint {
                             // Ignore
                         }
                     }
-                }catch ( IOException x ) {
-                    if ( running ) log.error(sm.getString("endpoint.accept.fail"), x);
+                } catch (IOException x) {
+                    if (running) {
+                        log.error(sm.getString("endpoint.accept.fail"), x);
+                    }
+                } catch (NullPointerException npe) {
+                    if (running) {
+                        log.error(sm.getString("endpoint.accept.fail"), npe);
+                    }
                 } catch (Throwable t) {
                     log.error(sm.getString("endpoint.accept.fail"), t);
                 }
-
                 // The processor will recycle itself when it finishes
-
             }
-
         }
-
     }