Fix NPE for failover query

cadence-workflow · Oct 13, 2020 · 6960e9b · 6960e9b
1 parent cd103de
commit 6960e9b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/tools/cli/adminFailoverCommands.go b/tools/cli/adminFailoverCommands.go
@@ -172,12 +172,17 @@ func AdminFailoverQuery(c *cli.Context) {
 	if err != nil {
 		ErrorAndExit("Failed to describe workflow", err)
 	}
-	if descResp.WorkflowExecutionInfo.CloseStatus.Equals(shared.WorkflowExecutionCloseStatusTerminated) {
+	if isWorkflowTerminated(descResp) {
 		result.State = failovermanager.WorkflowAborted
 	}
 	prettyPrintJSONObject(result)
 }
 
+func isWorkflowTerminated(descResp *shared.DescribeWorkflowExecutionResponse) bool {
+	return descResp.WorkflowExecutionInfo.CloseStatus != nil &&
+		descResp.WorkflowExecutionInfo.CloseStatus.Equals(shared.WorkflowExecutionCloseStatusTerminated)
+}
+
 // AdminFailoverAbort abort a failover workflow
 func AdminFailoverAbort(c *cli.Context) {
 	client := getCadenceClient(c)