--- java/org/apache/catalina/startup/TldConfig.java	(revision 784615)
+++ java/org/apache/catalina/startup/TldConfig.java	Mon Sep 14 15:54:30 CEST 2009
@@ -741,7 +741,9 @@ 
                 log.error(sm.getString(
                         "tldConfig.execute", context.getPath()), e);
             }
+        } else if (event.getType().equals(Lifecycle.AFTER_STOP_EVENT)) {
+            listeners.clear();
-        } // Ignore the other event types - nothing to do 
+        } // Ignore the other event types - nothing to do
     }
     
     private void init() {