ExecutorSubscribableChannel's SendTask actually returns local MessageHandler now

Issue: Issue: SPR-12272

Author: jhoeller

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

@@ -105,25 +105,23 @@ private class SendTask implements MessageHandlingRunnable {
 
 		private final Message<?> inputMessage;
 
-		private final MessageHandler handler;
+		private final MessageHandler messageHandler;
 
 		private int interceptorIndex = -1;
 
-
-		public SendTask(Message<?> message, MessageHandler handler) {
+		public SendTask(Message<?> message, MessageHandler messageHandler) {
 			this.inputMessage = message;
-			this.handler = handler;
+			this.messageHandler = messageHandler;
 		}
 
-
 		@Override
 		public Message<?> getMessage() {
 			return this.inputMessage;
 		}
 
 		@Override
 		public MessageHandler getMessageHandler() {
-			return this.getMessageHandler();
+			return this.messageHandler;
 		}
 
 		@Override
@@ -134,27 +132,27 @@ public void run() {
 				if (message == null) {
 					return;
 				}
-				this.handler.handleMessage(message);
+				this.messageHandler.handleMessage(message);
 				triggerAfterMessageHandled(message, null);
 			}
 			catch (Exception ex) {
 				triggerAfterMessageHandled(message, ex);
 				if (ex instanceof MessagingException) {
 					throw (MessagingException) ex;
 				}
-				String description = "Failed to handle " + message + " to " + this + " in " + this.handler;
+				String description = "Failed to handle " + message + " to " + this + " in " + this.messageHandler;
 				throw new MessageDeliveryException(message, description, ex);
 			}
 			catch (Error ex) {
-				String description = "Failed to handle " + message + " to " + this + " in " + this.handler;
+				String description = "Failed to handle " + message + " to " + this + " in " + this.messageHandler;
 				triggerAfterMessageHandled(message, new MessageDeliveryException(message, description, ex));
 				throw ex;
 			}
 		}
 
 		private Message<?> applyBeforeHandle(Message<?> message) {
 			for (ExecutorChannelInterceptor interceptor : executorInterceptors) {
-				message = interceptor.beforeHandle(message, ExecutorSubscribableChannel.this, this.handler);
+				message = interceptor.beforeHandle(message, ExecutorSubscribableChannel.this, this.messageHandler);
 				if (message == null) {
 					String name = interceptor.getClass().getSimpleName();
 					if (logger.isDebugEnabled()) {
@@ -172,7 +170,7 @@ private void triggerAfterMessageHandled(Message<?> message, Exception ex) {
 			for (int i = this.interceptorIndex; i >= 0; i--) {
 				ExecutorChannelInterceptor interceptor = executorInterceptors.get(i);
 				try {
-					interceptor.afterMessageHandled(message, ExecutorSubscribableChannel.this, this.handler, ex);
+					interceptor.afterMessageHandled(message, ExecutorSubscribableChannel.this, this.messageHandler, ex);
 				}
 				catch (Throwable ex2) {
 					logger.error("Exception from afterMessageHandled in " + interceptor, ex2);