Only set empty list for list types

This commit is contained in:
Jordan Liggitt 2017-01-13 14:08:10 -05:00
parent 3fa44312ad
commit fc5342a587
No known key found for this signature in database
GPG Key ID: 24E7ADF9A3B42012

View File

@ -335,7 +335,7 @@ func ListResource(r rest.Lister, rw rest.Watcher, scope RequestScope, forceWatch
}
trace.Step("Self-linking done")
// 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 {
scope.err(err, res.ResponseWriter, req.Request)
return