--- java/org/apache/catalina/core/StandardPipeline.java	(revision 1303369)
+++ java/org/apache/catalina/core/StandardPipeline.java	(working copy)
@@ -458,7 +458,9 @@ 
             }
         }
         try {
-            ((Lifecycle) valve).destroy();
+            if (valve instanceof Lifecycle) {
+                ((Lifecycle) valve).destroy();
+            }
         } catch (LifecycleException e) {
             log.error("StandardPipeline.removeValve: destroy: ", e);
         }