Fix issue where checkAndClearTimerFiredEvent returns wrong event (cad…

…ence-workflow#2021)
abhishekj720 · Jun 13, 2019 · 3302bb8 · 3302bb8
1 parent d6fc587
commit 3302bb8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/service/history/mutableStateBuilder.go b/service/history/mutableStateBuilder.go
@@ -546,7 +546,9 @@ func checkAndClearTimerFiredEvent(
 	if timerFiredIdx == -1 {
 		return events, nil
 	}
-	return append(events[:timerFiredIdx], events[timerFiredIdx+1:]...), events[timerFiredIdx]
+
+	timerEvent := events[timerFiredIdx]
+	return append(events[:timerFiredIdx], events[timerFiredIdx+1:]...), timerEvent
 }
 
 func convertUpdateActivityInfos(inputs map[*persistence.ActivityInfo]struct{}) []*persistence.ActivityInfo {