Author: markt
Date: Sat Oct 1 13:42:16 2011
New Revision: 1177978
URL: http://svn.apache.org/viewvc?rev=1177978&view=rev
Log:
Merge branch 'bug51910' into trunk
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=1177978&r1=1177977&r2=1177978&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Sat
Oct 1 13:42:16 2011
@@ -349,7 +349,13 @@ final class StandardWrapperValve
// This should be a Request attribute...
long t1=System.currentTimeMillis();
// FIXME: Add a flag to count the total amount of events processed ?
requestCount++;
+
StandardWrapper wrapper = (StandardWrapper) getContainer();
+ if (wrapper == null) {
+ // Context has been shutdown. Nothing to do here.
+ return;
+ }
+
Servlet servlet = null;
Context context = (Context) wrapper.getParent();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
