Merge branch 'master' into fixmocksa

uber-go · Aug 20, 2020 · 556bb09 · 556bb09
2 parents d7b8491 + 15ec566
commit 556bb09
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/internal/internal_task_pollers.go b/internal/internal_task_pollers.go
@@ -779,7 +779,7 @@ func newGetHistoryPageFunc(
 			var err1 error
 			h, err1 = serializer.DeserializeBlobDataToHistoryEvents(resp.RawHistory, s.HistoryEventFilterTypeAllEvent)
 			if err1 != nil {
-				return nil, nil, nil
+				return nil, nil, err1
 			}
 		} else {
 			h = resp.History