Merge pull request #3944 from samuelAndalon/22.x-avoid-wrapping-fvi-completable-future

dondonz · web-flow · commit 059a0ffd749e · 2025-05-11T13:04:11.000+10:00
avoid wrapping materialized fieldValueObject in a completable future
diff --git a/src/main/java/graphql/execution/ExecutionStrategy.java b/src/main/java/graphql/execution/ExecutionStrategy.java
@@ -651,10 +651,13 @@ private FieldValueInfo completeField(GraphQLFieldDefinition fieldDef, ExecutionC
         );
 
         FieldValueInfo fieldValueInfo = completeValue(executionContext, newParameters);
-
-        CompletableFuture<Object> executionResultFuture = fieldValueInfo.getFieldValueFuture();
         ctxCompleteField.onDispatched();
-        executionResultFuture.whenComplete(ctxCompleteField::onCompleted);
+        if (fieldValueInfo.isFutureValue()) {
+            CompletableFuture<Object> executionResultFuture = fieldValueInfo.getFieldValueFuture();
+            executionResultFuture.whenComplete(ctxCompleteField::onCompleted);
+        } else {
+            ctxCompleteField.onCompleted(fieldValueInfo.getFieldValueObject(), null);
+        }
         return fieldValueInfo;
     }
 
