From fb46e732ec82869354f9e7ea2978ca194d20542e Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Mon, 4 May 2020 13:35:23 +0100 Subject: [PATCH] api.Context.NotFound(...) should tolerate nil There is an unfortunate signature change with the api.Context NotFound function; whereas the normal modules/context/Context NotFound function requires an error or nil, the api.Context variant will panic with an NPE if a nil is provided. This PR will allow api.Context.NotFound to tolerate a being passed a nil. Signed-off-by: Andrew Thornton --- modules/context/api.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/context/api.go b/modules/context/api.go index fd9983c52b5b..4e189ce07767 100644 --- a/modules/context/api.go +++ b/modules/context/api.go @@ -212,6 +212,11 @@ func (ctx *APIContext) NotFound(objs ...interface{}) { var message = "Not Found" var errors []string for _, obj := range objs { + // Ignore nil + if obj == nil { + continue + } + if err, ok := obj.(error); ok { errors = append(errors, err.Error()) } else {