Defensive catching of any Throwable subclasses instead of just Error

Issue: SPR-14329
Issue: SPR-14323
(cherry picked from commit a9fda3e)

Author: jhoeller

spring-messaging/src/main/java/org/springframework/messaging/support/AbstractMessageChannel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -126,9 +126,9 @@ public final boolean send(Message<?> message, long timeout) {
 			}
 			throw new MessageDeliveryException(message,"Failed to send message to " + this, ex);
 		}
-		catch (Error ex) {
+		catch (Throwable err) {
 			MessageDeliveryException ex2 =
-					new MessageDeliveryException(message, "Failed to send message to " + this, ex);
+					new MessageDeliveryException(message, "Failed to send message to " + this, err);
 			chain.triggerAfterSendCompletion(message, this, sent, ex2);
 			throw ex2;
 		}

spring-messaging/src/main/java/org/springframework/messaging/support/ExecutorSubscribableChannel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,7 +99,7 @@ public boolean sendInternal(Message<?> message, long timeout) {
 
 
 	/**
-	 * Invoke a MessageHandler with ExecutorChannelInterceptor's.
+	 * Invoke a MessageHandler with ExecutorChannelInterceptors.
 	 */
 	private class SendTask implements MessageHandlingRunnable {
 
@@ -143,10 +143,11 @@ public void run() {
 				String description = "Failed to handle " + message + " to " + this + " in " + this.messageHandler;
 				throw new MessageDeliveryException(message, description, ex);
 			}
-			catch (Error ex) {
+			catch (Throwable err) {
 				String description = "Failed to handle " + message + " to " + this + " in " + this.messageHandler;
-				triggerAfterMessageHandled(message, new MessageDeliveryException(message, description, ex));
-				throw ex;
+				MessageDeliveryException ex2 = new MessageDeliveryException(message, description, err);
+				triggerAfterMessageHandled(message, ex2);
+				throw ex2;
 			}
 		}
 

spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -142,7 +142,7 @@ public <T> T execute(TransactionCallback<T> action) throws TransactionException
 				rollbackOnException(status, err);
 				throw err;
 			}
-			catch (Exception ex) {
+			catch (Throwable ex) {
 				// Transactional code threw unexpected exception -> rollback
 				rollbackOnException(status, ex);
 				throw new UndeclaredThrowableException(ex, "TransactionCallback threw undeclared checked exception");

spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/DispatcherPortlet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -687,7 +687,7 @@ protected void doActionService(ActionRequest request, ActionResponse response) t
 				throw ex;
 			}
 		}
-		catch (Error err) {
+		catch (Throwable err) {
 			PortletException ex =
 					new PortletException("Error occured during request processing: " + err.getMessage(), err);
 			// Trigger after-completion for thrown exception.
@@ -800,7 +800,7 @@ protected void doRenderService(RenderRequest request, RenderResponse response) t
 			triggerAfterRenderCompletion(mappedHandler, interceptorIndex, request, response, ex);
 			throw ex;
 		}
-		catch (Error err) {
+		catch (Throwable err) {
 			PortletException ex =
 					new PortletException("Error occured during request processing: " + err.getMessage(), err);
 			// Trigger after-completion for thrown exception.
@@ -891,7 +891,7 @@ protected void doResourceService(ResourceRequest request, ResourceResponse respo
 			triggerAfterResourceCompletion(mappedHandler, interceptorIndex, request, response, ex);
 			throw ex;
 		}
-		catch (Error err) {
+		catch (Throwable err) {
 			PortletException ex =
 					new PortletException("Error occured during request processing: " + err.getMessage(), err);
 			// Trigger after-completion for thrown exception.
@@ -965,7 +965,7 @@ protected void doEventService(EventRequest request, EventResponse response) thro
 				throw ex;
 			}
 		}
-		catch (Error err) {
+		catch (Throwable err) {
 			PortletException ex =
 					new PortletException("Error occured during request processing: " + err.getMessage(), err);
 			// Trigger after-completion for thrown exception.

spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java

@@ -975,7 +975,7 @@ protected void doDispatch(HttpServletRequest request, HttpServletResponse respon
 		catch (Exception ex) {
 			triggerAfterCompletion(processedRequest, response, mappedHandler, ex);
 		}
-		catch (Error err) {
+		catch (Throwable err) {
 			triggerAfterCompletionWithError(processedRequest, response, mappedHandler, err);
 		}
 		finally {
@@ -1300,7 +1300,7 @@ private void triggerAfterCompletion(HttpServletRequest request, HttpServletRespo
 	}
 
 	private void triggerAfterCompletionWithError(HttpServletRequest request, HttpServletResponse response,
-			HandlerExecutionChain mappedHandler, Error error) throws Exception {
+			HandlerExecutionChain mappedHandler, Throwable error) throws Exception {
 
 		ServletException ex = new NestedServletException("Handler processing failed", error);
 		if (mappedHandler != null) {