From 5bbd7bea38254f63a1d8af98b7b988d9fad183c4 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 1 Oct 2011 13:42:16 +0000
Subject: [PATCH] Merge branch 'bug51910' into trunk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1177978 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/StandardWrapperValve.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java b/java/org/apache/catalina/core/StandardWrapperValve.java
index 74e0a4d0b..9e27fcb0c 100644
--- a/java/org/apache/catalina/core/StandardWrapperValve.java
+++ b/java/org/apache/catalina/core/StandardWrapperValve.java
@@ -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();
 
-- 
2.11.0