From 2c6f496ca7051caf99ea6d05749ea45b1467f32e Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Sun, 6 Jul 2008 22:50:55 +0000
Subject: [PATCH] Removed AopContext.currentProxy() call for now.

---
 .../integration/endpoint/AbstractEndpoint.java       | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java
index 9aa47efe46..bc24696bbc 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractEndpoint.java
@@ -24,7 +24,6 @@ import org.aopalliance.aop.Advice;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.context.Lifecycle;
 import org.springframework.integration.ConfigurationException;
@@ -232,16 +231,7 @@ public abstract class AbstractEndpoint implements MessageEndpoint, BeanNameAware
 			throw new MessageHandlerNotRunningException(message);
 		}
 		if (message.getPayload() instanceof EndpointVisitor) {
-			MessageEndpoint endpoint = null;
-			try {
-				endpoint = (MessageEndpoint) AopContext.currentProxy();
-			}
-			catch (IllegalStateException e) {
-				if (logger.isDebugEnabled()) {
-					logger.debug("The currenty proxy is not exposed.");
-				}
-			}
-			((EndpointVisitor) message.getPayload()).visitEndpoint((endpoint != null) ? endpoint : this);
+			((EndpointVisitor) message.getPayload()).visitEndpoint(this);
 			return true;
 		}
 		if (!this.supports(message)) {