Merge pull request #115 from DavyC/master

Stuck at Dispose while checking the leftover sema

Author: dustinhiatt-wf

queue/queue.go

@@ -294,7 +294,12 @@ func (q *Queue) Dispose() []interface{} {
 	q.disposed = true
 	for _, waiter := range q.waiters {
 		waiter.response.Add(1)
-		waiter.ready <- true
+		select {
+		case waiter.ready <- true:
+			// release Poll immediately
+		default:
+			// ignore if it's a timeout or in the get
+		}
 	}
 
 	disposedItems := q.items

queue/queue_test.go

@@ -256,6 +256,19 @@ func TestEmptyGetWithDispose(t *testing.T) {
 	assert.IsType(t, ErrDisposed, err)
 }
 
+func TestDisposeAfterEmptyPoll(t *testing.T) {
+	q := New(10)
+
+	_, err := q.Poll(1, time.Millisecond)
+	assert.IsType(t, ErrTimeout, err)
+
+	// it should not hang
+	q.Dispose()
+
+	_, err = q.Poll(1, time.Millisecond)
+	assert.IsType(t, ErrDisposed, err)
+}
+
 func TestGetPutDisposed(t *testing.T) {
 	q := New(10)