From d23e5933f9b6b37f4385a80174284106e9bef7c6 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 3 Sep 2015 17:16:52 +0200 Subject: [PATCH] Fix nil pointer dereference --- pkg/api/helpers.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/api/helpers.go b/pkg/api/helpers.go index 59c56e86be..da3b1a29f9 100644 --- a/pkg/api/helpers.go +++ b/pkg/api/helpers.go @@ -389,13 +389,13 @@ func WaitForServerState(api *ScalewayAPI, serverID string, targetState string) ( for { server, err = api.GetServer(serverID) + if err != nil { + return nil, err + } if currentState != server.State { log.Infof("Server changed state to '%s'", server.State) currentState = server.State } - if err != nil { - return nil, err - } if server.State == targetState { break }