axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kei...@apache.org
Subject svn commit: r678685 - /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java
Date Tue, 22 Jul 2008 08:54:00 GMT
Author: keithc
Date: Tue Jul 22 01:54:00 2008
New Revision: 678685

URL: http://svn.apache.org/viewvc?rev=678685&view=rev
Log:
Fixing https://issues.apache.org/jira/browse/AXIS2-3897

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java?rev=678685&r1=678684&r2=678685&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/HTTPLocationBasedDispatcher.java
Tue Jul 22 01:54:00 2008
@@ -21,10 +21,7 @@
 package org.apache.axis2.dispatchers;
 
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.AxisBinding;
-import org.apache.axis2.description.AxisBindingOperation;
 import org.apache.axis2.description.AxisEndpoint;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
@@ -67,43 +64,14 @@
                         .getProperty(WSDL2Constants.ENDPOINT_LOCAL_NAME);
                 // Here we check whether the request was dispatched to the correct endpoint.
If it
                 // was we can dispatch the operation using the HTTPLocationDispatcher table
of that
-                // specific endpoint. In most cases we wont be able to do this. So as a last
resort
-                // iterate through the endpoint map and try to dispatch the operation.
+                // specific endpoint. 
                 if (axisEndpoint != null) {
                     Map httpLocationTable = (Map) axisEndpoint.getBinding()
                             .getProperty(WSDL2Constants.HTTP_LOCATION_TABLE);
                     if (httpLocationTable != null) {
                         return getOperationFromHTTPLocation(httpLocation, httpLocationTable);
                     }
-                } else {
-                    Map endpoints = axisService.getEndpoints();
-                    if (endpoints != null) {
-                        Iterator iterator = endpoints.values().iterator();
-                        while (iterator.hasNext()) {
-                            AxisEndpoint endpoint = (AxisEndpoint) iterator.next();
-                            Map httpLocationTable = (Map) endpoint.getBinding()
-                                    .getProperty(WSDL2Constants.HTTP_LOCATION_TABLE);
-                            if (httpLocationTable != null) {
-                                AxisOperation axisOperation =
-                                        getOperationFromHTTPLocation(httpLocation,
-                                                                     httpLocationTable);
-                                if (axisOperation != null) {
-                                    messageContext.setProperty(WSDL2Constants.ENDPOINT_LOCAL_NAME,
-                                                               endpoint);
-                                    AxisBinding axisBinding = endpoint.getBinding();
-                                    if (axisBinding != null) {
-                                        AxisBindingOperation axisBindingOperation =
-                                                (AxisBindingOperation) axisBinding
-                                                        .getChild(axisOperation.getName());
-                                        messageContext.setProperty(Constants.AXIS_BINDING_OPERATION,
-                                                                   axisBindingOperation);
-                                        return axisOperation;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
+                } 
             } else {
                 log.debug("Attempt to check for Operation using HTTP Location failed");
                 return null;
@@ -173,4 +141,4 @@
         }
         return null;
     }
-}
\ No newline at end of file
+}



Mime
View raw message