Author: markt
Date: Fri Jul 1 19:51:53 2016
New Revision: 1751000
URL: http://svn.apache.org/viewvc?rev=1751000&view=rev
Log:
Review of all calls to user code prior to calling InstanceManager.destroy()
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 1 19:51:53 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747980,1747
993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750899,1750975
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747980,1747
993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750899,1750975,1750995
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1751000&r1=1750999&r2=1751000&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
Fri Jul 1 19:51:53 2016
@@ -300,8 +300,7 @@ public final class ApplicationFilterConf
unregisterJMX();
- if (this.filter != null)
- {
+ if (this.filter != null) {
try {
if (Globals.IS_SECURITY_ENABLED) {
try {
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1751000&r1=1750999&r2=1751000&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Fri Jul 1 19:51:53 2016
@@ -204,6 +204,7 @@ standardWrapper.allocate=Error allocatin
standardWrapper.allocateException=Allocate exception for servlet {0}
standardWrapper.deallocateException=Deallocate exception for servlet {0}
standardWrapper.destroyException=Servlet.destroy() for servlet {0} threw
exception
+standardWrapper.destroyInstance=InstanceManager.destroy() for servlet [{0}]
threw exception
standardWrapper.initException=Servlet.init() for servlet {0} threw exception
standardWrapper.instantiate=Error instantiating servlet class {0}
standardWrapper.isUnavailable=Servlet {0} is currently unavailable
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1751000&r1=1750999&r2=1751000&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Fri
Jul 1 19:51:53 2016
@@ -1370,10 +1370,6 @@ public class StandardWrapper extends Con
instance.destroy();
}
- // Annotation processing
- if (!((Context) getParent()).getIgnoreAnnotations()) {
-
((StandardContext)getParent()).getInstanceManager().destroyInstance(instance);
- }
} catch (Throwable t) {
t = ExceptionUtils.unwrapInvocationTargetException(t);
ExceptionUtils.handleThrowable(t);
@@ -1386,6 +1382,15 @@ public class StandardWrapper extends Con
(sm.getString("standardWrapper.destroyException",
getName()),
t);
} finally {
+ // Annotation processing
+ if (!((Context) getParent()).getIgnoreAnnotations()) {
+ try {
+
((Context)getParent()).getInstanceManager().destroyInstance(instance);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+
log.error(sm.getString("standardWrapper.destroyInstance", getName()), t);
+ }
+ }
// Write captured output
if (swallowOutput) {
String log = SystemLogHandler.stopCapture();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1751000&r1=1750999&r2=1751000&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Jul
1 19:51:53 2016
@@ -880,8 +880,13 @@ public abstract class AbstractProtocol<S
ClassLoader oldCL =
upgradeToken.getContextBind().bind(false, null);
try {
httpUpgradeHandler.destroy();
-
instanceManager.destroyInstance(httpUpgradeHandler);
} finally {
+ try {
+
instanceManager.destroyInstance(httpUpgradeHandler);
+ } catch (Throwable e) {
+ ExceptionUtils.handleThrowable(e);
+
getLog().error(sm.getString("abstractConnectionHandler.error"), e);
+ }
upgradeToken.getContextBind().unbind(false,
oldCL);
}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java?rev=1751000&r1=1750999&r2=1751000&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java Fri
Jul 1 19:51:53 2016
@@ -144,15 +144,7 @@ public class TagHandlerPool {
}
}
// There is no need for other threads to wait for us to release
- handler.release();
- try {
- instanceManager.destroyInstance(handler);
- } catch (Exception e) {
- Throwable t = ExceptionUtils.unwrapInvocationTargetException(e);
- ExceptionUtils.handleThrowable(t);
- log.warn("Error processing preDestroy on tag instance of " +
- handler.getClass().getName(), t);
- }
+ doRelease(handler);
}
/**
@@ -161,19 +153,30 @@ public class TagHandlerPool {
*/
public synchronized void release() {
for (int i = current; i >= 0; i--) {
- Tag handler = handlers[i];
+ doRelease(handlers[i]);
+ }
+ }
+
+
+ private void doRelease(Tag handler) {
+ try {
handler.release();
- try {
- instanceManager.destroyInstance(handler);
- } catch (Exception e) {
- Throwable t =
ExceptionUtils.unwrapInvocationTargetException(e);
- ExceptionUtils.handleThrowable(t);
- log.warn("Error processing preDestroy on tag instance of "
- + handler.getClass().getName(), t);
- }
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ log.warn("Error processing release on tag instance of "
+ + handler.getClass().getName(), t);
+ }
+ try {
+ instanceManager.destroyInstance(handler);
+ } catch (Exception e) {
+ Throwable t = ExceptionUtils.unwrapInvocationTargetException(e);
+ ExceptionUtils.handleThrowable(t);
+ log.warn("Error processing preDestroy on tag instance of "
+ + handler.getClass().getName(), t);
}
}
+
protected static String getOption(ServletConfig config, String name,
String defaultV) {
if (config == null)
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1751000&r1=1750999&r2=1751000&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/websocket/WsSession.java Fri
Jul 1 19:51:53 2016
@@ -537,24 +537,36 @@ public class WsSession implements Sessio
private void fireEndpointOnClose(CloseReason closeReason) {
// Fire the onClose event
+ Throwable throwable = null;
InstanceManager instanceManager =
webSocketContainer.getInstanceManager();
+ if (instanceManager == null) {
+ instanceManager =
InstanceManagerBindings.get(applicationClassLoader);
+ }
Thread t = Thread.currentThread();
ClassLoader cl = t.getContextClassLoader();
t.setContextClassLoader(applicationClassLoader);
try {
localEndpoint.onClose(this, closeReason);
- if (instanceManager == null) {
- instanceManager =
InstanceManagerBindings.get(applicationClassLoader);
- }
+ } catch (Throwable t1) {
+ ExceptionUtils.handleThrowable(t1);
+ throwable = t1;
+ } finally {
if (instanceManager != null) {
- instanceManager.destroyInstance(localEndpoint);
+ try {
+ instanceManager.destroyInstance(localEndpoint);
+ } catch (Throwable t2) {
+ ExceptionUtils.handleThrowable(t2);
+ if (throwable == null) {
+ throwable = t2;
+ }
+ }
}
- } catch (Throwable throwable) {
- ExceptionUtils.handleThrowable(throwable);
- localEndpoint.onError(this, throwable);
- } finally {
t.setContextClassLoader(cl);
}
+
+ if (throwable != null) {
+ fireEndpointOnError(throwable);
+ }
}
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1751000&r1=1750999&r2=1751000&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Fri Jul 1 19:51:53 2016
@@ -84,6 +84,11 @@
attempts during the lock out period will no longer reset the lock out
timer to zero. (markt)
</fix>
+ <fix>
+ Improve error handling around user code prior to calling
+ <code>InstanceManager.destroy()</code> to ensure that the method is
+ executed. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -107,14 +112,19 @@
secure HTTP/2 connections that meant an incorrect value was retured
when
using the default port. (markt)
</fix>
+ <fix>
+ Improve error handling around user code prior to calling
+ <code>InstanceManager.destroy()</code> to ensure that the method is
+ executed. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
<changelog>
<fix>
- Catch and log any <code>Exception</code>s during calls to
- <code>Servlet.destroy()</code> when destroying the Servlet associated
- with a JSP page. (markt)
+ Improve error handling around user code prior to calling
+ <code>InstanceManager.destroy()</code> to ensure that the method is
+ executed. (markt)
</fix>
</changelog>
</subsection>
@@ -126,6 +136,11 @@
dedicated WebSocket Executor. It has been replaced by the use of the
Connector/Endpoint provided Executor. (markt)
</scode>
+ <fix>
+ Improve error handling around user code prior to calling
+ <code>InstanceManager.destroy()</code> to ensure that the method is
+ executed. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web Applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
