Merge pull request #8670 from jbdalido/nilparameters

thockin · thockin · commit fc8aa104ae85 · 2015-05-27T15:39:23.000-07:00
Quick fix for listPods with nil parameters
diff --git a/pkg/client/request.go b/pkg/client/request.go
@@ -359,6 +359,9 @@ func (r *Request) FieldsSelectorParam(s fields.Selector) *Request {
 	if r.err != nil {
 		return r
 	}
+	if s == nil {
+		return r
+	}
 	if s.Empty() {
 		return r
 	}
@@ -377,6 +380,9 @@ func (r *Request) LabelsSelectorParam(s labels.Selector) *Request {
 	if r.err != nil {
 		return r
 	}
+	if s == nil {
+		return r
+	}
 	if s.Empty() {
 		return r
 	}

Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,9 @@ func (r Request) FieldsSelectorParam(s fields.Selector) Request {`
`359`	`359`	`if r.err != nil {`
`360`	`360`	`return r`
`361`	`361`	`}`
	`362`	`+ if s == nil {`
	`363`	`+ return r`
	`364`	`+ }`
`362`	`365`	`if s.Empty() {`
`363`	`366`	`return r`
`364`	`367`	`}`
`@@ -377,6 +380,9 @@ func (r Request) LabelsSelectorParam(s labels.Selector) Request {`
`377`	`380`	`if r.err != nil {`
`378`	`381`	`return r`
`379`	`382`	`}`
	`383`	`+ if s == nil {`
	`384`	`+ return r`
	`385`	`+ }`
`380`	`386`	`if s.Empty() {`
`381`	`387`	`return r`
`382`	`388`	`}`