Author: markt
Date: Wed Dec 9 12:50:58 2015
New Revision: 1718838
URL: http://svn.apache.org/viewvc?rev=1718838&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58701
Reset the instanceInitialized field in StandardWrapper when unloading a Servlet
so that a new instance may be correctly initialized.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1718838&r1=1718837&r2=1718838&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Wed Dec 9
12:50:58 2015
@@ -1464,6 +1464,7 @@ public class StandardWrapper extends Con
// Deregister the destroyed instance
instance = null;
+ instanceInitialized = false;
if (isJspServlet && jspMonitorON != null ) {
Registry.getRegistry(null, null).unregisterComponent(jspMonitorON);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1718838&r1=1718837&r2=1718838&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Dec 9 12:50:58 2015
@@ -121,6 +121,11 @@
<code>validateClientProvidedNewSessionId</code> so client provided
session IDs may be rejected if validation is enabled. (markt)
</fix>
+ <fix>
+ <bug>58701</bug>: Reset the <code>instanceInitialized</code> field in
+ <code>StandardWrapper</code> when unloading a Servlet so that a new
+ instance may be correctly initialized. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
