[servicecomb-kie] branch master updated: set revision header when key not exists (#105)

[tianxiaoliang]

This is an automated email from the ASF dual-hosted git repository.

tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-kie.git


The following commit(s) were added to refs/heads/master by this push:
     new 8dcda6a  set revision header when key not exists (#105)
8dcda6a is described below

commit 8dcda6a2625505df05c8798b5d0167a4d4b42085
Author: zhulijian <zhuliji...@huawei.com>
AuthorDate: Mon Mar 2 15:33:41 2020 +0800

    set revision header when key not exists (#105)
---
 server/resource/v1/common.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/resource/v1/common.go b/server/resource/v1/common.go
index 9787cc7..2a5678c 100644
--- a/server/resource/v1/common.go
+++ b/server/resource/v1/common.go
@@ -238,20 +238,21 @@ func queryAndResponse(rctx *restful.Context,
        if status != "" {
                opts = append(opts, service.WithStatus(status))
        }
+       rev, err := service.RevisionService.GetRevision(rctx.Ctx, 
domain.(string))
+       if err != nil {
+               WriteErrResponse(rctx, http.StatusInternalServerError, 
err.Error(), common.ContentTypeText)
+               return
+       }
        kv, err := service.KVService.List(rctx.Ctx, domain.(string), project, 
opts...)
        if err != nil {
                if err == service.ErrKeyNotExists {
+                       
rctx.ReadResponseWriter().Header().Set(common.HeaderRevision, 
strconv.FormatInt(rev, 10))
                        WriteErrResponse(rctx, http.StatusNotFound, 
err.Error(), common.ContentTypeText)
                        return
                }
                WriteErrResponse(rctx, http.StatusInternalServerError, 
err.Error(), common.ContentTypeText)
                return
        }
-       rev, err := service.RevisionService.GetRevision(rctx.Ctx, 
domain.(string))
-       if err != nil {
-               WriteErrResponse(rctx, http.StatusInternalServerError, 
err.Error(), common.ContentTypeText)
-               return
-       }
        rctx.ReadResponseWriter().Header().Set(common.HeaderRevision, 
strconv.FormatInt(rev, 10))
        err = writeResponse(rctx, kv)
        rctx.Ctx = context.WithValue(rctx.Ctx, common.RespBodyContextKey, kv)