Merge pull request #26925 from ZTE-PaaS/249043822-patch-1

Automatic merge from submit-queue optimize deleteFromIndices method of thread_safe_store As all methods of thread_safe_store are threadsafe, so i think, in deleteFromIndices method, if the index is nil, need not run the for structure below

Merge pull request #26925 from ZTE-PaaS/249043822-patch-1
59b88d7a · k8s-merge-robot · GitHub · 601173c2 · 5dbf21aa · 59b88d7a
Commit 59b88d7a authored Jun 25, 2016 by k8s-merge-robot Committed by GitHub Jun 25, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

thread_safe_store.go pkg/client/cache/thread_safe_store.go +6 -5

No files found.
--- a/pkg/client/cache/thread_safe_store.go
+++ b/pkg/client/cache/thread_safe_store.go
@@ -261,12 +261,13 @@ func (c *threadSafeMap) deleteFromIndices(obj interface{}, key string) error {
 		}

 		index := c.indices[name]
+		if index == nil {
+			continue
+		}
 		for _, indexValue := range indexValues {
-			if index != nil {
-				set := index[indexValue]
-				if set != nil {
-					set.Delete(key)
-				}
+			set := index[indexValue]
+			if set != nil {
+				set.Delete(key)
 			}
 		}
 	}