You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ch...@apache.org on 2011/12/06 09:23:19 UTC

svn commit: r1210821 - /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointContext.java

Author: charith
Date: Tue Dec  6 08:23:19 2011
New Revision: 1210821

URL: http://svn.apache.org/viewvc?rev=1210821&view=rev
Log:
fix SYNAPSE-820

Modified:
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointContext.java

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointContext.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointContext.java?rev=1210821&r1=1210820&r2=1210821&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointContext.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointContext.java Tue Dec  6 08:23:19 2011
@@ -387,7 +387,7 @@ public class EndpointContext {
                 } else if (state == ST_OFF) {
                     return false;
 
-                } else if (System.currentTimeMillis() > nextRetryTime) {
+                } else if (System.currentTimeMillis() >= nextRetryTime) {
                     // if we are not active, but reached the next retry time, return true but do not
                     // make a state change. We will make the state change on a successful send
                     // if we are in the ST_TIMEOUT state, reduce a remaining retry
@@ -420,13 +420,12 @@ public class EndpointContext {
             } else if (localState == ST_OFF) {
                 return false;
 
-            } else if (System.currentTimeMillis() > localNextRetryTime) {
+            } else if (System.currentTimeMillis() >= localNextRetryTime) {
 
                 // if we are not active, but reached the next retry time, return true but do not
                 // make a state change. We will make the state change on a successful send
                 // if we are in the ST_TIMEOUT state, reduce a remaining retry
                 if (localState == ST_TIMEOUT) {
-                    localRemainingRetries--;
 
                     if (log.isDebugEnabled()) {
                         log.debug("Endpoint : " + endpointName + " which is currently in timeout " +