From 0ccf1b78123ce006da14a63c980842726be686e2 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Fri, 18 Jul 2014 12:36:27 -0400 Subject: [PATCH] Operation server was not returning in error cases --- pkg/apiserver/apiserver.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index 004aa434dac..4fdef4bc297 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -164,6 +164,7 @@ func (server *APIServer) ServeHTTP(w http.ResponseWriter, req *http.Request) { http.StatusOK, http.StatusAccepted, http.StatusConflict, + http.StatusNotFound, ), ).Log() @@ -352,6 +353,7 @@ func (server *APIServer) handleREST(parts []string, req *http.Request, w http.Re body, err := server.readBody(req) if err != nil { server.error(err, w) + return } obj, err := storage.Extract(body) if IsNotFound(err) { @@ -391,6 +393,7 @@ func (server *APIServer) handleOperationRequest(w http.ResponseWriter, req *http } if req.Method != "GET" { server.notFound(req, w) + return } if len(parts) == 0 { // List outstanding operations. @@ -402,6 +405,7 @@ func (server *APIServer) handleOperationRequest(w http.ResponseWriter, req *http op := server.ops.Get(parts[0]) if op == nil { server.notFound(req, w) + return } obj, complete := op.StatusOrResult()