change complete logic

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIProviderImpl.java

@@ -5633,14 +5633,25 @@ public void deployAPIRevision(String apiId, String apiRevisionUUID,
                 revisionWFDto.setEnvironment(apiRevisionDeployment.getDeployment());
                 revisionWFDto.setRevisionId(String.valueOf(revisionId));
                 revisionDeploymentWFExecutor.execute(revisionWFDto);
-                revisionDeploymentWFExecutor.complete(revisionWFDto);
             } catch (WorkflowException e) {
                 log.error("Unable to execute Revision Deployment Workflow for revision: " + apiRevisionUUID, e);
                 handleException("Unable to execute Revision Deployment Workflow for revision: " + apiRevisionUUID, e);
             }
 
             // get the workflow state once the executor is executed.
             WorkflowDTO wfDTO = apiMgtDAO.retrieveWorkflow(revisionWFDto.getExternalWorkflowReference());
+            WorkflowStatus apiWFState = null;
+            if (wfDTO != null) {
+                apiWFState = wfDTO.getStatus();
+            }
+            // if the workflow has started, then executor should not fire again
+            if (WorkflowStatus.CREATED.equals(apiWFState)) {
+                try {
+                    revisionDeploymentWFExecutor.complete(wfDTO);
+                } catch (WorkflowException e) {
+                    log.error("Unable to update status of the revision: " + apiRevisionUUID, e);
+                }
+            }
 
             // only send the notification if approved
             // wfDTO is null when simple wf executor is used because wf state is not stored in the db.

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/workflow/APIRevisionDeploymentSimpleWorkflowExecutor.java

@@ -57,6 +57,7 @@ public WorkflowResponse execute(WorkflowDTO workFlowDTO) throws WorkflowExceptio
 
         workFlowDTO.setStatus(WorkflowStatus.APPROVED);
         workFlowDTO.setMetadata(ENVIRONMENT_PROPERTY, revisionWorkFlowDTO.getEnvironment());
+        complete(workFlowDTO);
         return new GeneralWorkflowResponse();
     }