Merge pull request kubernetes#23210 from rsc/master

Auto commit by PR queue bot
rancher · Mar 19, 2016 · 4be9587 · 4be9587
2 parents ed6088a + e4b369e
commit 4be9587
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/storage/cacher.go b/pkg/storage/cacher.go
@@ -502,9 +502,11 @@ func (c *cacheWatcher) stop() {
 }
 
 func (c *cacheWatcher) add(event watchCacheEvent) {
+	t := time.NewTimer(5 * time.Second)
+	defer t.Stop()
 	select {
 	case c.input <- event:
-	case <-time.After(5 * time.Second):
+	case <-t.C:
 		// This means that we couldn't send event to that watcher.
 		// Since we don't want to blockin on it infinitely,
 		// we simply terminate it.