svn commit: r549764 - /incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java

[jliu]

Author: jliu
Date: Fri Jun 22 02:51:25 2007
New Revision: 549764

URL: http://svn.apache.org/viewvc?view=rev&rev=549764
Log:
Removed unnecessary interceptors for Dispatch inbound. 

Modified:
    
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java

Modified: 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java?view=diff&rev=549764&r1=549763&r2=549764
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
 Fri Jun 22 02:51:25 2007
@@ -60,6 +60,7 @@
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.MessageSenderInterceptor;
 import 
org.apache.cxf.jaxws.handler.logical.DispatchLogicalHandlerOutInterceptor;
+import org.apache.cxf.jaxws.handler.logical.LogicalHandlerInInterceptor;
 import org.apache.cxf.jaxws.handler.soap.SOAPHandlerInterceptor;
 import org.apache.cxf.jaxws.interceptors.DispatchInInterceptor;
 import org.apache.cxf.jaxws.interceptors.DispatchOutInterceptor;
@@ -236,7 +237,6 @@
         if (endpoint instanceof JaxWsEndpointImpl) {
             Binding jaxwsBinding = 
((JaxWsEndpointImpl)endpoint).getJaxwsBinding();
             if (endpoint.getBinding() instanceof SoapBinding) {
-                //endpoint.getInInterceptors().add(new 
SOAPHandlerInterceptor(jaxwsBinding));
                 chain.add(new SOAPHandlerInterceptor(jaxwsBinding));
             } else {
                 // TODO: what for non soap bindings?
@@ -266,10 +266,13 @@
         }
         chain.add(il);
 
-        if (LOG.isLoggable(Level.FINE)) {
-            LOG.fine("Interceptors contributed by endpoint: " + il);
-        }
-        chain.add(endpoint.getInInterceptors());
+        if (endpoint instanceof JaxWsEndpointImpl) {
+            Binding jaxwsBinding = 
((JaxWsEndpointImpl)endpoint).getJaxwsBinding();
+            if (endpoint.getBinding() instanceof SoapBinding) {
+                chain.add(new SOAPHandlerInterceptor(jaxwsBinding));
+            }      
+            chain.add(new LogicalHandlerInInterceptor(jaxwsBinding));
+        }           
 
         List<Interceptor> inInterceptors = new ArrayList<Interceptor>();
         inInterceptors.add(new DispatchInInterceptor(cl, mode));