github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #39886 from liggitt/fix-empty-list-error

Browse Source 
Automatic merge from submit-queue

Only set empty list for list types

If List() impls return non-list objects (like Status objects), we shouldn't try to set them to an empty list

follow up to #39834
This commit is contained in:
Kubernetes Submit Queue 2017-01-13 16:15:33 -08:00 committed by GitHub
commit 20d239a5bc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/genericapiserver/api/handlers/rest.go
View File

@ -335,7 +335,7 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
} }
trace.Step("Self-linking done") trace.Step("Self-linking done")
// Ensure empty lists return a non-nil items slice // Ensure empty lists return a non-nil items slice
if numberOfItems == 0 { if numberOfItems == 0 && meta.IsListType(result) {
if err := meta.SetList(result, []runtime.Object{}); err != nil { if err := meta.SetList(result, []runtime.Object{}); err != nil {
scope.err(err, res.ResponseWriter, req.Request) scope.err(err, res.ResponseWriter, req.Request)
return return