Author: markt
Date: Tue Nov 24 01:27:40 2009
New Revision: 883565
URL: http://svn.apache.org/viewvc?rev=883565&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47836
Don't keep TLD/listener info between reloads
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=883565&r1=883564&r2=883565&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Nov 24
01:27:40 2009
@@ -4815,6 +4815,7 @@
applicationListeners = new String[0];
applicationEventListenersObjects = new Object[0];
applicationLifecycleListenersObjects = new Object[0];
+ taglibs = new HashMap<String, String>();
if(log.isDebugEnabled())
log.debug("resetContext " + oname);
Modified: tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=883565&r1=883564&r2=883565&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java Tue Nov 24
01:27:40 2009
@@ -608,7 +608,10 @@
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() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
