From 8a5c0daed461dba669443aae1a9f2f3b4b69ad23 Mon Sep 17 00:00:00 2001 From: rubyist Date: Mon, 21 Sep 2015 10:07:51 -0400 Subject: [PATCH] Move the batcher nil check down so retries work in "legacy" mode --- lfs/transfer_queue.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lfs/transfer_queue.go b/lfs/transfer_queue.go index 082189c8..815871a4 100644 --- a/lfs/transfer_queue.go +++ b/lfs/transfer_queue.go @@ -90,12 +90,14 @@ func (q *TransferQueue) Wait() { q.retrywait.Wait() atomic.StoreUint32(&q.retrying, 1) - if len(q.retries) > 0 && q.batcher != nil { + if len(q.retries) > 0 { tracerx.Printf("tq: retrying %d failed transfers", len(q.retries)) for _, t := range q.retries { q.Add(t) } - q.batcher.Exit() + if q.batcher != nil { + q.batcher.Exit() + } q.wait.Wait() }