From d5ec862e26ab0738744fbc773a57b2cfe75cc607 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Thu, 6 Feb 2020 16:57:47 +0800 Subject: [PATCH] fix: api gateway rpc handler redudant response --- pkg/apigateway/handler/rpc.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/apigateway/handler/rpc.go b/pkg/apigateway/handler/rpc.go index 21ea85d2be..6e6da1f12c 100644 --- a/pkg/apigateway/handler/rpc.go +++ b/pkg/apigateway/handler/rpc.go @@ -117,21 +117,24 @@ func rpcHandler(ctx context.Context, w http.ResponseWriter, req *http.Request) { v, ok := retobj.Interface().(jsonutils.JSONObject) if ok { appsrv.SendJSON(w, v) + return } v2, ok := retobj.Interface().([]modulebase.SubmitResult) if ok { w.WriteHeader(207) appsrv.SendJSON(w, modulebase.SubmitResults2JSON(v2)) - } else { - httperrors.BadGatewayError(w, "recv invalid data") + return } + + httperrors.BadGatewayError(w, "recv invalid data") } else { v, ok := reterr.Interface().(*httputils.JSONClientError) if ok { httperrors.JsonClientError(w, v) - } else { - httperrors.BadGatewayError(w, fmt.Sprintf("%s", reterr.Interface())) + return } + + httperrors.BadGatewayError(w, fmt.Sprintf("%s", reterr.Interface())) } }