From 13ce13664dee36fef81bcdad761501454626fcb8 Mon Sep 17 00:00:00 2001 From: m1093782566 Date: Thu, 8 Sep 2016 09:46:48 +0800 Subject: [PATCH] always return false if error not nil in Get(pcb) Change-Id: I37bd4d8948a8a5c0017966958547904595b28119 --- pkg/controller/petset/pet.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/controller/petset/pet.go b/pkg/controller/petset/pet.go index 65c4816bc9..033017fca2 100644 --- a/pkg/controller/petset/pet.go +++ b/pkg/controller/petset/pet.go @@ -166,15 +166,13 @@ type apiServerPetClient struct { // Get gets the pet in the pcb from the apiserver. func (p *apiServerPetClient) Get(pet *pcb) (*pcb, bool, error) { - found := true ns := pet.parent.Namespace pod, err := podClient(p.c, ns).Get(pet.pod.Name) if errors.IsNotFound(err) { - found = false - err = nil + return nil, false, nil } - if err != nil || !found { - return nil, found, err + if err != nil { + return nil, false, err } realPet := *pet realPet.pod = pod