Update list close workflows filter check (cadence-workflow#1650)

zshni · Apr 5, 2019 · 613b4c1 · 613b4c1
1 parent de3fb1c
commit 613b4c1
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/service/frontend/workflowHandler.go b/service/frontend/workflowHandler.go
@@ -2526,9 +2526,6 @@ func (wh *WorkflowHandler) ListClosedWorkflowExecutions(ctx context.Context,
 	}
 
 	filterCount := 0
-	if listRequest.ExecutionFilter != nil {
-		filterCount++
-	}
 	if listRequest.TypeFilter != nil {
 		filterCount++
 	}
@@ -2539,7 +2536,7 @@ func (wh *WorkflowHandler) ListClosedWorkflowExecutions(ctx context.Context,
 	if filterCount > 1 {
 		return nil, wh.error(&gen.BadRequestError{
 			Message: "Only one of ExecutionFilter, TypeFilter or StatusFilter is allowed"}, scope)
-	}
+	} // If ExecutionFilter is provided with one of TypeFilter or StatusFilter, use ExecutionFilter and ignore other filter
 
 	if listRequest.GetMaximumPageSize() <= 0 {
 		listRequest.MaximumPageSize = common.Int32Ptr(int32(wh.config.VisibilityMaxPageSize(listRequest.GetDomain())))