Merge pull request #13631 from louyihua/eqopt

OpenShift Bot · web-flow · commit dec90cf2c534 · 2017-04-11T07:01:58.000-05:00
Merged by openshift-bot
diff --git a/pkg/client/cache/eventqueue.go b/pkg/client/cache/eventqueue.go
@@ -304,7 +304,7 @@ func (eq *EventQueue) Pop() (watch.EventType, interface{}, error) {
 		// Track the last replace key immediately after the store
 		// state has been changed to prevent subsequent errors from
 		// leaving a stale key.
-		if eq.lastReplaceKey != "" && eq.lastReplaceKey == key {
+		if eq.lastReplaceKey == key {
 			eq.lastReplaceKey = ""
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ func (eq *EventQueue) Pop() (watch.EventType, interface{}, error) {`
`304`	`304`	`// Track the last replace key immediately after the store`
`305`	`305`	`// state has been changed to prevent subsequent errors from`
`306`	`306`	`// leaving a stale key.`
`307`		`- if eq.lastReplaceKey != "" && eq.lastReplaceKey == key {`
	`307`	`+ if eq.lastReplaceKey == key {`
`308`	`308`	`eq.lastReplaceKey = ""`
`309`	`309`	`}`
`310`	`310`