commit e169cffc790d7bdb3d7289b6b99b73291066a9d5
author shafreen <shafreen@wso2.com> Sat Apr 04 19:11:29 2020 +0530
committer shafreen <shafreen@wso2.com> Sat Apr 04 19:11:29 2020 +0530
tree 559573ddca02a6c06bc3df36e3bf92b1cc3871f7
parent 338a58b3dde0ebb4be3f4dcc1525f40823b80ea0

Refactor max delivery attempts

modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java

diff --git a/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java b/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java
index 7a7ac84..e8a1670 100644
--- a/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java
+++ b/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ForwardingJob.java
@@ -82,7 +82,7 @@
                 ScheduledMessageForwardingProcessor.PROCESSOR_INSTANCE);
         Map<String, Object> parameters = (Map<String, Object>) jdm.get(MessageProcessorConstants.PARAMETERS);
         maxDeliverAttempts = extractMaxDeliveryAttempts(parameters, processor);
-        isMaxDeliverAttemptDropEnabled = isMaxDeliverAttemptDropEnabled(parameters, maxDeliverAttempts);
+        isMaxDeliverAttemptDropEnabled = isMaxDeliverAttemptDropEnabled(parameters);
         retryHttpStatusCodes(parameters);
         setSequences(parameters);
     }
@@ -104,7 +104,7 @@
         return maxDeliverAttempts;
     }
 
-    private boolean isMaxDeliverAttemptDropEnabled(Map<String, Object> parameters, int maxDeliverAttempts) {
+    private boolean isMaxDeliverAttemptDropEnabled(Map<String, Object> parameters) {
         boolean isMaxDeliverAttemptDropEnabled = false;
         if (maxDeliverAttempts > 0 && parameters.get(ForwardingProcessorConstants.MAX_DELIVER_DROP) != null &&
                 parameters.get(ForwardingProcessorConstants.MAX_DELIVER_DROP).toString()
@@ -243,7 +243,7 @@
                 processor.resetSentAttemptCount();
             }
         } catch (Exception e) {
-            errorStop = handleOutOnlyError(maxDeliverAttempts, isMaxDeliverAttemptDropEnabled, inMsgCtx);
+            errorStop = handleOutOnlyError(inMsgCtx);
             log.error("Error Forwarding Message ", e);
         }
     }
@@ -251,7 +251,7 @@
     private void handleResponse(MessageContext inMsgCtx, MessageContext outCtx) {
         handle400and500statusCodes(outCtx);
         if ("true".equals(outCtx.getProperty(SynapseConstants.BLOCKING_CLIENT_ERROR))) {
-            handleError(maxDeliverAttempts, inMsgCtx, outCtx);
+            handleError(inMsgCtx, outCtx);
         } else {
             // This Means we have invoked an out only operation
             // remove the message and reset the count
@@ -275,17 +275,17 @@
         }
     }
 
-    private void handleError(int maxDeliverAttempts, MessageContext inMsgCtx, MessageContext outCtx) {
+    private void handleError(MessageContext inMsgCtx, MessageContext outCtx) {
         if (isHttpStatusCodeError(outCtx)) {
             if (isRetryHttpStatusCode(outCtx)) {
-                doPostErrorTasks(maxDeliverAttempts, inMsgCtx, outCtx);
+                doPostErrorTasks(inMsgCtx, outCtx);
             }
         } else {
-            doPostErrorTasks(maxDeliverAttempts, inMsgCtx, outCtx);
+            doPostErrorTasks(inMsgCtx, outCtx);
         }
     }
 
-    private void doPostErrorTasks(int maxDeliverAttempts, MessageContext inMsgCtx, MessageContext outCtx) {
+    private void doPostErrorTasks(MessageContext inMsgCtx, MessageContext outCtx) {
         if (maxDeliverAttempts > 0) {
             processor.incrementSendAttemptCount();
         }
@@ -298,8 +298,7 @@
         errorStop = true;
     }
 
-    private boolean handleOutOnlyError(int maxDeliverAttempts, boolean isMaxDeliverAttemptDropEnabled,
-                                       MessageContext messageContext) {
+    private boolean handleOutOnlyError(MessageContext inMsgCtx) {
         if (maxDeliverAttempts > 0) {
             processor.incrementSendAttemptCount();
             if (processor.getSendAttemptCount() >= maxDeliverAttempts) {
@@ -309,7 +308,7 @@
                     processor.resetSentAttemptCount();
                     messageStore.poll();
                 } else {
-                    deactivate(processor, messageContext);
+                    deactivate(processor, inMsgCtx);
                 }
             }
         }