github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37350 from chentao1596/delete-meaningless-judgments

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 39280, 37350, 39389, 39390, 39313)

delete meaningless judgments

What this PR does / why we need it：
      Whether "err" is nil or not, "err" can be return, so the judgment "err !=nil " is unnecessary
This commit is contained in:
Kubernetes Submit Queue 2017-01-03 18:25:10 -08:00 committed by GitHub
commit fe391d7bb0
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/pod_workers.go
View File

@ -171,10 +171,7 @@ func (p *podWorkers) managePodLoop(podUpdates <-chan UpdatePodOptions) {
updateType: update.UpdateType, updateType: update.UpdateType,
}) })
lastSyncTime = time.Now() lastSyncTime = time.Now()
if err != nil { return err
return err
}
return nil
}() }()
// notify the call-back function if the operation succeeded or not // notify the call-back function if the operation succeeded or not
if update.OnCompleteFunc != nil { if update.OnCompleteFunc != nil {