Merge "[FAB-13602] Fix time.Timer leak in gossip handshake" into rele…

…ase-1.4
hyperledger · Jan 11, 2019 · 8faadaf · 8faadaf
2 parents ec8d9ea + 481ae97
commit 8faadaf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gossip/comm/comm_impl.go b/gossip/comm/comm_impl.go
@@ -638,8 +638,8 @@ func readWithTimeout(stream interface{}, timeout time.Duration, address string)
 		}
 	}()
 	select {
-	case <-time.NewTicker(timeout).C:
-		return nil, errors.Errorf("Timed out waiting for connection message from %s", address)
+	case <-time.After(timeout):
+		return nil, errors.Errorf("timed out waiting for connection message from %s", address)
 	case m := <-incChan:
 		return m, nil
 	case err := <-errChan: