Fix panic in frontend on empty PollForDecisionTask response (cadence-…

…workflow#141) Issue cadence-workflow#135
MartinGomes · Apr 19, 2017 · 70abdc1 · 70abdc1
1 parent d098154
commit 70abdc1
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/service/frontend/handler.go b/service/frontend/handler.go
@@ -263,9 +263,13 @@ func (wh *WorkflowHandler) PollForDecisionTask(
 		return nil, wrapError(err)
 	}
 
-	history, err := wh.getHistory(info.ID, *matchingResp.GetWorkflowExecution(), matchingResp.GetStartedEventId()+1)
-	if err != nil {
-		return nil, wrapError(err)
+	var history *gen.History
+	if matchingResp.IsSetWorkflowExecution() {
+		// Non-empty response. Get the history
+		history, err = wh.getHistory(info.ID, *matchingResp.GetWorkflowExecution(), matchingResp.GetStartedEventId()+1)
+		if err != nil {
+			return nil, wrapError(err)
+		}
 	}
 	return createPollForDecisionTaskResponse(matchingResp, history), nil
 }