synapse-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject svn commit: r579696 - in /webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: config/xml/endpoints/ core/axis2/ endpoints/
Date Wed, 26 Sep 2007 15:35:17 GMT
Author: ruwan
Date: Wed Sep 26 08:35:16 2007
New Revision: 579696

URL: http://svn.apache.org/viewvc?rev=579696&view=rev
Log:
Fixing issue SYNAPSE-129

Modified:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java?rev=579696&r1=579695&r2=579696&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
(original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
Wed Sep 26 08:35:16 2007
@@ -150,9 +150,9 @@
         }
         if (address != null) {
             endpoint.setAddress(address.getAttributeValue());
-        } else {
-            handleException("One of the 'address' or 'ref' attributes are required in an
"
-                    + "anonymous endpoint");
+//        } else {
+//            handleException("One of the 'address' or 'ref' attributes are required in an
"
+//                    + "anonymous endpoint");
         }
         if (format != null)
         {
@@ -220,7 +220,7 @@
                     try {
                         long timeoutSeconds = new Long(d.trim()).longValue();
                         endpoint.setTimeoutDuration(timeoutSeconds * 1000);
-                        
+
                     } catch (NumberFormatException e) {
                         handleException(
                             "The timeout seconds should be specified as a valid number ::
"

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java?rev=579696&r1=579695&r2=579696&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
(original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
Wed Sep 26 08:35:16 2007
@@ -119,8 +119,8 @@
         if (endpt.getAddress() != null) {
             address.addAttribute(fac.createOMAttribute(
                     "uri", null, endpt.getAddress()));
-        } else {
-            handleException("Invalid Endpoint. Address is required");
+//        } else {
+//            handleException("Invalid Endpoint. Address is required");
         }
 
         int isEnableStatistics = endpt.getStatisticsEnable();

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?rev=579696&r1=579695&r2=579696&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
(original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
Wed Sep 26 08:35:16 2007
@@ -118,10 +118,7 @@
 
         // set all the details of the endpoint only to the cloned message context
         // so that we can use the original message context for resending through different
endpoints
-        String eprAddress = null;
-        if (endpoint != null && endpoint.getAddress() != null) {
-
-            eprAddress = endpoint.getAddress().toString();
+        if (endpoint != null) {
 
             if (endpoint.isForcePOX()) {
                 axisOutMsgCtx.setDoingREST(true);
@@ -149,11 +146,13 @@
                 axisOutMsgCtx.setDoingSwA(true);
             }
 
+            if (endpoint.getAddress() != null) {
+                axisOutMsgCtx.setTo(new EndpointReference(endpoint.getAddress()));
+            }
+
             if (endpoint.isUseSeparateListener()) {
                 axisOutMsgCtx.getOptions().setUseSeparateListener(true);
             }
-
-            axisOutMsgCtx.setTo(new EndpointReference(eprAddress));
         }
 
         if (wsAddressingEnabled) {
@@ -295,7 +294,7 @@
 
         return newMC;
     }
-    
+
     private static void copyRMOptions(MessageContext oriContext, Options targetOptions) {
         Options oriOptions = oriContext.getOptions();
         if(oriOptions.getProperty(SynapseConstants.SANDESHA_LAST_MESSAGE) != null) {
@@ -315,7 +314,7 @@
                     oriOptions.getProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID));
         }
     }
-    
+
     /**
      * Get the Policy object for the given name from the Synapse configuration at runtime
      * @param synCtx the current synapse configuration to get to the synapse configuration

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java?rev=579696&r1=579695&r2=579696&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java
(original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java
Wed Sep 26 08:35:16 2007
@@ -146,7 +146,7 @@
     public void send(MessageContext synCtx) {
 
         String endPointName = this.getName();
-        if(endPointName ==null) {
+        if(endPointName == null) {
             endPointName = SynapseConstants.ANONYMOUS_ENDPOINTS;
         }
         // Setting Required property to collect the End Point statistics



---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org


Mime
View raw message