Author: markt
Date: Wed Dec 9 12:34:11 2015
New Revision: 1718834
URL: http://svn.apache.org/viewvc?rev=1718834&view=rev
Log:
newInstance needs to be set unconditionally if a newInstance is created else
the logic later in the method won't work as intended.
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=1718834&r1=1718833&r2=1718834&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:34:11 2015
@@ -814,12 +814,14 @@ public class StandardWrapper extends Con
if (log.isDebugEnabled())
log.debug("Allocating non-STM instance");
+ // Note: We don't know if the Servlet implements
+ // SingleThreadModel until we have loaded it.
instance = loadServlet();
+ newInstance = true;
if (!singleThreadModel) {
// For non-STM, increment here to prevent a
race
// condition with unload. Bug 43683, test case
// #3
- newInstance = true;
countAllocated.incrementAndGet();
}
} catch (ServletException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
