don't return nil ctx

nitrictech · Sep 25, 2024 · 661ac55 · 661ac55
1 parent f6e9756
commit 661ac55
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/nitric/middleware.go b/nitric/middleware.go
@@ -134,6 +134,14 @@ func (c *chainedMiddleware[T]) invoke(ctx *T) (*T, error) {
 		c.nextFunc = dummyHandler[T]
 	}
 
+	outCtx, err := c.fun(ctx, c.nextFunc)
+
+	// The returned context should never be nil, since it's used to create the response.
+	// If it is, return the current context and the error
+	if outCtx == nil {
+		return ctx, err
+	}
+
 	return c.fun(ctx, c.nextFunc)
 }