Fix null type handling regression in requireSameOutputTypeShape

claude · claude · commit e27544af3e55 · 2026-03-03T17:03:53.000Z
Restore the original null-handling logic that was incorrectly simplified in 072165b. When both typeA and typeB are null (e.g., from fragments on unresolvable types), they should be treated as compatible rather than producing a spurious FieldsConflict error. https://claude.ai/code/session_01XYg9Dqneb941aStgKaZ1Em
diff --git a/src/main/java/graphql/validation/OperationValidator.java b/src/main/java/graphql/validation/OperationValidator.java
@@ -1241,8 +1241,11 @@ private boolean sameArguments(List<Argument> arguments1, @Nullable List<Argument
             }
             GraphQLType typeA = typeAOriginal;
             GraphQLType typeB = fieldAndType.graphQLType;
-            if (typeB == null) {
-                return mkNotSameTypeError(path, fields, typeA, typeB);
+            if (typeA == null || typeB == null) {
+                if (typeA != typeB) {
+                    return mkNotSameTypeError(path, fields, typeA, typeB);
+                }
+                continue;
             }
             while (true) {
                 if (isNonNull(typeA) || isNonNull(typeB)) {

Original file line number	Diff line number	Diff line change
`@@ -1241,8 +1241,11 @@ private boolean sameArguments(List<Argument> arguments1, @Nullable List<Argument`
`1241`	`1241`	`}`
`1242`	`1242`	`GraphQLType typeA = typeAOriginal;`
`1243`	`1243`	`GraphQLType typeB = fieldAndType.graphQLType;`
`1244`		`- if (typeB == null) {`
`1245`		`- return mkNotSameTypeError(path, fields, typeA, typeB);`
	`1244`	`+ if (typeA == null \|\| typeB == null) {`
	`1245`	`+ if (typeA != typeB) {`
	`1246`	`+ return mkNotSameTypeError(path, fields, typeA, typeB);`
	`1247`	`+ }`
	`1248`	`+ continue;`
`1246`	`1249`	`}`
`1247`	`1250`	`while (true) {`
`1248`	`1251`	`if (isNonNull(typeA) \|\| isNonNull(typeB)) {`