Author: markt
Date: Fri Sep 17 16:30:54 2010
New Revision: 998190
URL: http://svn.apache.org/viewvc?rev=998190&view=rev
Log:
Also handle NPEs (seen during testing of new async re-factoring) and ignore
them if the endpoint is shutting down.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=998190&r1=998189&r2=998190&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Fri Sep 17
16:30:54 2010
@@ -193,18 +193,20 @@ public class JIoEndpoint extends Abstrac
// 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
-
}
-
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
