Author: remy.maucherat(a)jboss.com Date: 2008-07-03 10:22:35 -0400 (Thu, 03 Jul 2008) New Revision: 697 Modified: trunk/java/org/apache/catalina/core/StandardWrapper.java Log: - Revert after diffing to check, as it is not useful. For non STM servlets, the number of "allocations" is not tracked. Modified: trunk/java/org/apache/catalina/core/StandardWrapper.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardWrapper.java 2008-07-03 14:14:44 UTC (rev 696) +++ trunk/java/org/apache/catalina/core/StandardWrapper.java 2008-07-03 14:22:35 UTC (rev 697) @@ -763,8 +763,6 @@ throw new ServletException (sm.getString("standardWrapper.unloading", getName())); - boolean newInstance = false; - // If not SingleThreadedModel, return the same instance every time if (!singleThreadModel) { @@ -777,12 +775,6 @@ log.debug("Allocating non-STM instance"); instance = loadServlet(); - // For non-STM, increment here to prevent a race - // condition with unload. Bug 43683, test case #3 - if (!singleThreadModel) { - newInstance = true; - countAllocated++; - } } catch (ServletException e) { throw e; } catch (Throwable e) { @@ -796,11 +788,6 @@ if (!singleThreadModel) { if (log.isTraceEnabled()) log.trace(" Returning non-STM instance"); - // For new instances, count will have been incremented at the - // time of creation - if (!newInstance) { - countAllocated++; - } return (instance); }