Author: markt
Date: Wed Dec 9 12:46:21 2015
New Revision: 1718837
URL: http://svn.apache.org/viewvc?rev=1718837&view=rev
Log:
Reduce risk of race condition with unload once BZ 58701 is fixed.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
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=1718837&r1=1718836&r2=1718837&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:46:21 2015
@@ -806,7 +806,7 @@ public class StandardWrapper extends Con
// If not SingleThreadedModel, return the same instance every time
if (!singleThreadModel) {
// Load and initialize our instance if necessary
- if (instance == null) {
+ if (instance == null || !instanceInitialized) {
synchronized (this) {
if (instance == null) {
try {
@@ -831,13 +831,12 @@ public class StandardWrapper extends Con
throw new
ServletException(sm.getString("standardWrapper.allocate"), e);
}
}
+ if (!instanceInitialized) {
+ initServlet(instance);
+ }
}
}
- if (!instanceInitialized) {
- initServlet(instance);
- }
-
if (singleThreadModel) {
if (newInstance) {
// Have to do this outside of the sync above to prevent a
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
