Properly handle infinite activity timeout (#308)

temporalio · Dec 10, 2020 · 574fd84 · 574fd84
1 parent a0afa20
commit 574fd84
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/internal/activity.go b/internal/activity.go
@@ -255,11 +255,16 @@ func WithActivityTask(
 	scheduleToCloseTimeout := common.DurationValue(task.GetScheduleToCloseTimeout())
 	startToCloseTimeout := common.DurationValue(task.GetStartToCloseTimeout())
 	heartbeatTimeout := common.DurationValue(task.GetHeartbeatTimeout())
-	scheduleToCloseDeadline := scheduled.Add(scheduleToCloseTimeout)
+
 	startToCloseDeadline := started.Add(startToCloseTimeout)
-	// Minimum of the two deadlines.
-	if scheduleToCloseDeadline.Before(startToCloseDeadline) {
-		deadline = scheduleToCloseDeadline
+	if scheduleToCloseTimeout > 0 {
+		scheduleToCloseDeadline := scheduled.Add(scheduleToCloseTimeout)
+		// Minimum of the two deadlines.
+		if scheduleToCloseDeadline.Before(startToCloseDeadline) {
+			deadline = scheduleToCloseDeadline
+		} else {
+			deadline = startToCloseDeadline
+		}
 	} else {
 		deadline = startToCloseDeadline
 	}