gRPC fix request context clean-up

fixes quarkusio#14820
michalszynkiewicz · Apr 27, 2021 · 0113ade · 0113ade
1 parent 9653238
commit 0113ade
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...untime/src/main/java/io/quarkus/grpc/runtime/supports/RequestScopeHandlerInterceptor.java b/...untime/src/main/java/io/quarkus/grpc/runtime/supports/RequestScopeHandlerInterceptor.java
@@ -9,6 +9,7 @@
 import io.grpc.ServerInterceptor;
 import io.grpc.Status;
 import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableContext;
 import io.quarkus.arc.ManagedContext;
 import io.vertx.core.Context;
 import io.vertx.core.Handler;
@@ -31,9 +32,13 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, Re
         // This interceptor is called first, so, we should be on the event loop.
         Context capturedVertxContext = Vertx.currentContext();
         if (capturedVertxContext != null) {
+            InjectableContext.ContextState state;
             boolean activateAndDeactivateContext = !reqContext.isActive();
             if (activateAndDeactivateContext) {
                 reqContext.activate();
+                state = reqContext.getState();
+            } else {
+                state = null;
             }
             return next.startCall(new ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT>(call) {
                 @Override
@@ -43,7 +48,7 @@ public void close(Status status, Metadata trailers) {
                         capturedVertxContext.runOnContext(new Handler<Void>() {
                             @Override
                             public void handle(Void ignored) {
-                                reqContext.deactivate();
+                                reqContext.destroy(state);
                             }
                         });
                     }