Merge pull request #34476 from quarkusio/revert-34339-rr-instance

Revert "Remove unnecessary synchronization when creating Resource instances
quarkusio · Jul 4, 2023 · 5d1fc20 · 5d1fc20
2 parents 468397a + 23f676c
commit 5d1fc20
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/...er/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InstanceHandler.java b/...er/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/InstanceHandler.java
@@ -10,6 +10,7 @@ public class InstanceHandler implements ServerRestHandler {
      * CDI Manages the lifecycle
      *
      */
+    private volatile Object instance;
     private final BeanFactory<Object> factory;
 
     public InstanceHandler(BeanFactory<Object> factory) {
@@ -18,7 +19,14 @@ public InstanceHandler(BeanFactory<Object> factory) {
 
     @Override
     public void handle(ResteasyReactiveRequestContext requestContext) throws Exception {
-        requestContext.requireCDIRequestScope();
-        requestContext.setEndpointInstance(factory.createInstance().getInstance());
+        if (instance == null) {
+            synchronized (this) {
+                if (instance == null) {
+                    requestContext.requireCDIRequestScope();
+                    instance = factory.createInstance().getInstance();
+                }
+            }
+        }
+        requestContext.setEndpointInstance(instance);
     }
 }