graphql-java
diff --git a/‎src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java‎
Lines changed: 2 additions & 2 deletions b/‎src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java‎
Lines changed: 6 additions & 0 deletions b/‎src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java‎
Lines changed: 6 additions & 0 deletions
@@ -305,8 +305,8 @@ public void deferredOnFieldValue(String resultKey, FieldValueInfo fieldValueInfo
         CallStack callStack = getCallStack(parameters);
         boolean ready = callStack.lock.callLocked(() -> {
             callStack.deferredFragmentRootFieldsFetched.add(fieldValueInfo);
-            DeferredCallContext deferredCallContext = Assert.assertNotNull(parameters.getDeferredCallContext());
-            return callStack.deferredFragmentRootFieldsFetched.size() == deferredCallContext.getFields();
+            AlternativeCallContext alternativeCallContext = Assert.assertNotNull(parameters.getDeferredCallContext());
+            return callStack.deferredFragmentRootFieldsFetched.size() == alternativeCallContext.getFields();
         });
         if (ready) {
             int curLevel = parameters.getPath().getLevel();
 
@@ -22,6 +22,7 @@
 import org.dataloader.DataLoader;
 import org.dataloader.DataLoaderRegistry;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.NullUnmarked;
 import org.jspecify.annotations.Nullable;
 
 import java.util.List;
@@ -33,11 +34,15 @@
 @Internal
 @NullMarked
 public class DataFetchingEnvironmentImpl implements DataFetchingEnvironment {
+    @Nullable
     private final Object source;
     private final Supplier<Map<String, Object>> arguments;
+    @Nullable
     private final Object context;
     private final GraphQLContext graphQLContext;
+    @Nullable
     private final Object localContext;
+    @Nullable
     private final Object root;
     private final GraphQLFieldDefinition fieldDefinition;
     private final MergedField mergedField;
@@ -265,6 +270,7 @@ public String toString() {
                 '}';
     }
 
+    @NullUnmarked
     public static class Builder {
 
         private Object source;