Skip to content

Commit 3e34fd1

Browse files
committed
fix lock in Remove func
Signed-off-by: Pavel Okhlopkov <[email protected]>
1 parent e39af03 commit 3e34fd1

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pkg/task/queue/task_queue_list.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,10 @@ func (q *TaskQueue) RemoveFirst() task.Task {
329329
defer q.MeasureActionTime("RemoveFirst")()
330330
var t task.Task
331331

332+
if q.isEmpty() {
333+
return nil
334+
}
335+
332336
q.withLock(func() {
333337
t = q.removeFirst()
334338
})
@@ -338,10 +342,6 @@ func (q *TaskQueue) RemoveFirst() task.Task {
338342

339343
// removeFirst deletes a head element, so head is moved.
340344
func (q *TaskQueue) removeFirst() task.Task {
341-
if q.isEmpty() {
342-
return nil
343-
}
344-
345345
element := q.items.Front()
346346
t := q.items.Remove(element)
347347
delete(q.idIndex, t.GetId())
@@ -359,6 +359,7 @@ func (q *TaskQueue) GetFirst() task.Task {
359359
if q.isEmpty() {
360360
return nil
361361
}
362+
362363
return q.items.Front().Value
363364
}
364365

0 commit comments

Comments
 (0)