handle unknown dataloader name case

andimarek · andimarek · commit ac23871ab106 · 2025-07-08T11:45:56.000+10:00
diff --git a/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java b/src/main/java/graphql/schema/DataFetchingEnvironmentImpl.java
@@ -226,10 +226,14 @@ public ExecutionStepInfo getExecutionStepInfo() {
 
     @Override
     public <K, V> @Nullable DataLoader<K, V> getDataLoader(String dataLoaderName) {
+        DataLoader<K, V> dataLoader = dataLoaderRegistry.getDataLoader(dataLoaderName);
+        if (dataLoader == null) {
+            return null;
+        }
         if (!graphQLContext.getBoolean(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING, false)) {
-            return dataLoaderRegistry.getDataLoader(dataLoaderName);
+            return dataLoader;
         }
-        return new DataLoaderWithContext<>(this, dataLoaderName, dataLoaderRegistry.getDataLoader(dataLoaderName));
+        return new DataLoaderWithContext<>(this, dataLoaderName, dataLoader);
     }
 
     @Override
