Author: markt
Date: Thu Jan 10 12:36:17 2013
New Revision: 1431321
URL: http://svn.apache.org/viewvc?rev=1431321&view=rev
Log:
Follow-up to r1431300. Fix error on reload when postConstruct and preDestroy
entries are present in weeb.xml
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1431320
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1431321&r1=1431320&r2=1431321&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu
Jan 10 12:36:17 2013
@@ -5622,6 +5622,9 @@ public class StandardContext extends Con
createdServlets.clear();
+ postConstructMethods.clear();
+ preDestroyMethods.clear();
+
if(log.isDebugEnabled())
log.debug("resetContext " + getObjectName());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
