Author: markt
Date: Fri Mar 7 14:10:15 2014
New Revision: 1575263
URL: http://svn.apache.org/r1575263
Log:
Improve the robustness of web application undeployment based on some code
analysis triggered by the report for BZ 54315
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1575262
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=1575263&r1=1575262&r2=1575263&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 Fri
Mar 7 14:10:15 2014
@@ -499,7 +499,7 @@ public class StandardContext extends Con
/**
* The request processing pause flag (while reloading occurs)
*/
- private boolean paused = false;
+ private volatile boolean paused = false;
/**
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1575263&r1=1575262&r2=1575263&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Fri
Mar 7 14:10:15 2014
@@ -211,7 +211,7 @@ public class StandardWrapper extends Con
/**
* Are we unloading our servlet instance at the moment?
*/
- protected boolean unloading = false;
+ protected volatile boolean unloading = false;
/**
@@ -1119,6 +1119,11 @@ public class StandardWrapper extends Con
*/
public synchronized Servlet loadServlet() throws ServletException {
+ if (unloading) {
+ throw new ServletException(
+ sm.getString("standardWrapper.unloading", getName()));
+ }
+
// Nothing to do if we already have an instance or an instance pool
if (!singleThreadModel && (instance != null))
return instance;
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1575263&r1=1575262&r2=1575263&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Mar 7 14:10:15 2014
@@ -64,6 +64,10 @@
<code>WebappClassLoader</code>. (markt)
</add>
<fix>
+ Improve the robustness of web application undeployment based on some
+ code analysis triggered by the report for <bug>54315</bug>. (markt)
+ </fix>
+ <fix>
<bug>56219</bug>:
Improve merging process for web.xml files to take account of the
elements and attributes supported by the Servlet version of the merged
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
