scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27950 from mml/fed-nil-subtree

Browse Source 
Automatic merge from submit-queue

Verify that the we get a non-nil subtree before consulting it.
This commit is contained in:
k8s-merge-robot
2016-06-23 12:54:37 -07:00
committed by GitHub
parent cfc4bc0a83 7a40584f66
commit 436a109a14
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/dns/treecache.go
View File

@@ -98,6 +98,9 @@ func (cache *TreeCache) setSubCache(key string, subCache *TreeCache, path ...str
func (cache *TreeCache) getEntry(key string, path ...string) (interface{}, bool) { func (cache *TreeCache) getEntry(key string, path ...string) (interface{}, bool) {
childNode := cache.getSubCache(path...) childNode := cache.getSubCache(path...)
if childNode == nil {
return nil, false
}
val, ok := childNode.Entries[key] val, ok := childNode.Entries[key]
return val, ok return val, ok
} }