github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-03 23:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47900 from yiqinguo/yiqinguo_add_type_judgment

Browse Source 
Automatic merge from submit-queue

Add type conversion judgment

If do not type conversion judgment, there may be panic.

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-06-29 04:00:18 -07:00
committed by GitHub
parent 343d751bc5 d170b0ca80
commit c9ad8dcde0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/dockershim/docker_service.go
View File

@@ -455,10 +455,13 @@ func (ds *dockerService) getDockerVersionFromCache() (*dockertypes.Version, erro
// We only store on key in the cache. // We only store on key in the cache.
const dummyKey = "version" const dummyKey = "version"
value, err := ds.versionCache.Get(dummyKey) value, err := ds.versionCache.Get(dummyKey)
dv := value.(*dockertypes.Version)
if err != nil { if err != nil {
return nil, err return nil, err
} }
dv, ok := value.(*dockertypes.Version)
if !ok {
return nil, fmt.Errorf("Converted to *dockertype.Version error")
}
return dv, nil return dv, nil
} }