Author: chathura_ce
Date: Mon May  7 23:21:20 2007
New Revision: 536088

URL: http://svn.apache.org/viewvc?view=rev&rev=536088
Log:
Set default timeout to 0 seconds.
Default timeout is set to 30 seconds if some valid action is set.

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/WSDLEndpointFactory.java
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AddressEndpoint.java
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.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?view=diff&rev=536088&r1=536087&r2=536088
==============================================================================
--- 
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
 Mon May  7 23:21:20 2007
@@ -226,8 +226,18 @@
                 if (a != null) {
                     if ((a.trim()).equalsIgnoreCase("discard")) {
                         endpoint.setTimeoutAction(Constants.DISCARD);
+
+                        // set timeout duration to 30 seconds, if it is not 
set explicitly
+                        if (endpoint.getTimeoutDuration() == 0) {
+                            endpoint.setTimeoutDuration(30000);
+                        }
                     } else if ((a.trim()).equalsIgnoreCase("fault")) {
                         endpoint.setTimeoutAction(Constants.DISCARD_AND_FAULT);
+
+                        // set timeout duration to 30 seconds, if it is not 
set explicitly
+                        if (endpoint.getTimeoutDuration() == 0) {
+                            endpoint.setTimeoutDuration(30000);
+                        }
                     }
                 }
             }

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java?view=diff&rev=536088&r1=536087&r2=536088
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
 Mon May  7 23:21:20 2007
@@ -288,8 +288,18 @@
                 if (a != null) {
                     if ((a.trim()).equalsIgnoreCase("discard")) {
                         endpointDefinition.setTimeoutAction(Constants.DISCARD);
+
+                        // set timeout duration to 30 seconds, if it is not 
set explicitly
+                        if (endpointDefinition.getTimeoutDuration() == 0) {
+                            endpointDefinition.setTimeoutDuration(30000);
+                        }
                     } else if ((a.trim()).equalsIgnoreCase("fault")) {
                         
endpointDefinition.setTimeoutAction(Constants.DISCARD_AND_FAULT);
+
+                        // set timeout duration to 30 seconds, if it is not 
set explicitly
+                        if (endpointDefinition.getTimeoutDuration() == 0) {
+                            endpointDefinition.setTimeoutDuration(30000);
+                        }
                     }
                 }
             }

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?view=diff&rev=536088&r1=536087&r2=536088
==============================================================================
--- 
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
 Mon May  7 23:21:20 2007
@@ -89,7 +89,7 @@
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name.trim();
     }
 
     /**

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java?view=diff&rev=536088&r1=536087&r2=536088
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/WSDLEndpoint.java
 Mon May  7 23:21:20 2007
@@ -151,7 +151,7 @@
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name.trim();
     }
 
     public long getSuspendOnFailDuration() {

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java?view=diff&rev=536088&r1=536087&r2=536088
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java
 Mon May  7 23:21:20 2007
@@ -54,11 +54,11 @@
 
     /**
      * timeout duration for waiting for a response. if the user has set some 
timeout action and
-     * the timeout duration is not set, default is set to 30 seconds. note 
that if the user has
+     * the timeout duration is not set, default is set to 0 seconds. note that 
if the user has
      * not set any timeout configuration, default timeout action is set to 
NONE, which won't do
      * anything for timeouts.
     */
-    private long timeoutDuration = 30000;
+    private long timeoutDuration = 0;
 
     /** action to perform when a timeout occurs (NONE | DISCARD | 
DISCARD_AND_FAULT) **/
     private int timeoutAction = Constants.NONE;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to