Merge pull request #35 from ivan-stankov-golang/master

TestShutdownEmpty
eapache · Feb 2, 2023 · 83b926b · 83b926b
2 parents 9e1a778 + 2e37f4c
commit 83b926b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/batcher/batcher.go b/batcher/batcher.go
@@ -111,8 +111,10 @@ func (b *Batcher) Shutdown(wait bool) {
 	b.flush()
 
 	if wait {
-		// wait done channel
-		<-b.done
+		if b.done != nil {
+			// wait done channel
+			<-b.done
+		}
 	}
 }
 

diff --git a/batcher/batcher_test.go b/batcher/batcher_test.go
@@ -88,6 +88,11 @@ func TestShutdownSuccess(t *testing.T) {
 	}
 }
 
+func TestShutdownEmpty(t *testing.T) {
+	b := New(10*time.Millisecond, returnsSuccess)
+	b.Shutdown(true)
+}
+
 func TestBatcherError(t *testing.T) {
 	b := New(10*time.Millisecond, returnsError)