From e253f279c0e908335778ad01a27e93c4400bca33 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 24 Nov 2009 01:27:40 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47836 Don't keep TLD/listener info between reloads git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@883565 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/core/StandardContext.java | 1 + java/org/apache/catalina/startup/TldConfig.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 1f05e72e7..e6b766507 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -4815,6 +4815,7 @@ public class StandardContext applicationListeners = new String[0]; applicationEventListenersObjects = new Object[0]; applicationLifecycleListenersObjects = new Object[0]; + taglibs = new HashMap(); if(log.isDebugEnabled()) log.debug("resetContext " + oname); diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java index 1cba6d8f3..7aea30e85 100644 --- a/java/org/apache/catalina/startup/TldConfig.java +++ b/java/org/apache/catalina/startup/TldConfig.java @@ -608,7 +608,10 @@ public final class TldConfig implements LifecycleListener { log.error(sm.getString( "tldConfig.execute", context.getPath()), e); } - } // Ignore the other event types - nothing to do + } else if (event.getType().equals(Lifecycle.STOP_EVENT)) { + taglibUris.clear(); + listeners.clear(); + } } private void init() { -- 2.11.0