From c618e605e15c0d7535f6c96ff8efbb0dba4fd66c Mon Sep 17 00:00:00 2001 From: Dimitrij Denissenko Date: Thu, 16 Aug 2018 16:22:32 +0100 Subject: [PATCH] Revert "Fix PartitionConsumer race condition on Close. (#258)" This reverts commit 6230ffbaec9398ba04312427b804c1506fae91ad. --- consumer.go | 2 +- partitions.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/consumer.go b/consumer.go index 8b4830e..e7a67da 100644 --- a/consumer.go +++ b/consumer.go @@ -295,7 +295,7 @@ func (c *Consumer) Close() (err error) { for range c.errors { } for p := range c.partitions { - p.AsyncClose() + _ = p.Close() } for range c.notifications { } diff --git a/partitions.go b/partitions.go index 16bdc67..bfaa587 100644 --- a/partitions.go +++ b/partitions.go @@ -86,7 +86,7 @@ func (c *partitionConsumer) InitialOffset() int64 { return c.initialOffset } // AsyncClose implements PartitionConsumer func (c *partitionConsumer) AsyncClose() { c.closeOnce.Do(func() { - c.PartitionConsumer.AsyncClose() + c.closeErr = c.PartitionConsumer.Close() close(c.dying) }) }