Author: keith
Date: Sun Aug  3 06:15:48 2008
New Revision: 20318
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=20318

Log:
Applying a patch to fix Mashup-1049



Modified:
   
branches/mashup/java/1.5/java/modules/patches/axis2/resources/axis2-patches.txt
   
branches/mashup/java/1.5/java/modules/patches/axis2/src/org/apache/axis2/description/AxisEndpoint.java

Modified: 
branches/mashup/java/1.5/java/modules/patches/axis2/resources/axis2-patches.txt
URL: 
http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/patches/axis2/resources/axis2-patches.txt?rev=20318&r1=20317&r2=20318&view=diff
==============================================================================
--- 
branches/mashup/java/1.5/java/modules/patches/axis2/resources/axis2-patches.txt 
    (original)
+++ 
branches/mashup/java/1.5/java/modules/patches/axis2/resources/axis2-patches.txt 
    Sun Aug  3 06:15:48 2008
@@ -4,4 +4,5 @@
 https://issues.apache.org/jira/browse/AXIS2-3877
 https://issues.apache.org/jira/browse/AXIS2-3897
 https://issues.apache.org/jira/browse/AXIS2-3902
+https://issues.apache.org/jira/browse/AXIS2-3961
 https://wso2.org/jira/browse/MASHUP-1048

Modified: 
branches/mashup/java/1.5/java/modules/patches/axis2/src/org/apache/axis2/description/AxisEndpoint.java
URL: 
http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/patches/axis2/src/org/apache/axis2/description/AxisEndpoint.java?rev=20318&r1=20317&r2=20318&view=diff
==============================================================================
--- 
branches/mashup/java/1.5/java/modules/patches/axis2/src/org/apache/axis2/description/AxisEndpoint.java
      (original)
+++ 
branches/mashup/java/1.5/java/modules/patches/axis2/src/org/apache/axis2/description/AxisEndpoint.java
      Sun Aug  3 06:15:48 2008
@@ -183,10 +183,13 @@
                                                        
.getTransportIn(transportInDescName);
                                        TransportListener listener = 
in.getReceiver();
                                        String ip = 
HttpUtils.getIpAddress(axisConfiguration);
-                                       // we should pass 
[serviceName].[endpointName] instead of
-                                       // [endpointName]
-                                       String sDOTe = serviceName + "." + name;
-                                       EndpointReference[] eprsForService = 
listener
+                    String sDOTe = serviceName;
+                    if (!"jms".equalsIgnoreCase(transportInDescName)) {
+                        // we should pass [serviceName].[endpointName] instead 
of
+                        // [endpointName]
+                        sDOTe = serviceName + "." + name;
+                    }
+                    EndpointReference[] eprsForService = listener
                                                        
.getEPRsForService(sDOTe, ip);
                                        // we consider only the first address 
return by the listener
                                        if (eprsForService != null && 
eprsForService.length > 0) {

_______________________________________________
Mashup-dev mailing list
[email protected]
http://mailman.wso2.org/cgi-bin/mailman/listinfo/mashup-dev

Reply via email to