Fix redispatch queue nil pointer exception (#3156)

uber · Mar 31, 2020 · 9b02fec · 9b02fec
1 parent 5a1f8d3
commit 9b02fec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/service/history/queueProcessor.go b/service/history/queueProcessor.go
@@ -311,6 +311,10 @@ func (p *queueProcessorBase) submitTask(
 }
 
 func (p *queueProcessorBase) redispatchTasks() {
+	if !p.isPriorityTaskProcessorEnabled() {
+		return
+	}
+
 	redispatchQueueTasks(
 		p.redispatchQueue,
 		p.queueTaskProcessor,

diff --git a/service/history/timerQueueProcessorBase.go b/service/history/timerQueueProcessorBase.go
@@ -381,6 +381,10 @@ func (t *timerQueueProcessorBase) submitTask(
 }
 
 func (t *timerQueueProcessorBase) redispatchTasks() {
+	if !t.isPriorityTaskProcessorEnabled() {
+		return
+	}
+
 	redispatchQueueTasks(
 		t.redispatchQueue,
 		t.queueTaskProcessor,