Author: remy.maucherat(a)jboss.com Date: 2011-06-21 05:24:10 -0400 (Tue, 21 Jun 2011) New Revision: 1741 Modified: trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java trunk/webapps/docs/changelog.xml Log: - More cleanup won't hurt. Modified: trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java =================================================================== --- trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java 2011-06-20 08:53:55 UTC (rev 1740) +++ trunk/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java 2011-06-21 09:24:10 UTC (rev 1741) @@ -133,7 +133,12 @@ if (ptd.handlers != null) { for (int i=ptd.current; i>=0; i--) { if (ptd.handlers[i] != null) { - ptd.handlers[i].release(); + try { + ptd.handlers[i].release(); + } catch (Exception e) { + log.warn("Error processing release on tag instance of " + + ptd.handlers[i].getClass().getName(), e); + } if (Constants.INJECT_TAGS || Constants.USE_INSTANCE_MANAGER_FOR_TAGS) { try { instanceManager.destroyInstance(ptd.handlers[i]); @@ -145,7 +150,10 @@ } } } + ptd.handlers = null; + ptd.current = -1; } + perThreadDataVector.clear(); } } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2011-06-20 08:53:55 UTC (rev 1740) +++ trunk/webapps/docs/changelog.xml 2011-06-21 09:24:10 UTC (rev 1741) @@ -31,6 +31,13 @@ </update> </changelog> </subsection> + <subsection name="Jasper"> + <changelog> + <fix> + Improve per thread tagpool cleanup. (remm) + </fix> + </changelog> + </subsection> </section> <section name="JBoss Web 7.0.0.CR2 (remm)">