Do not overuse makeNullableAsSpecified in TypeSubstitutor

2014-08-27 12:51:49 +04:00
parent 920769d36d
commit 364a7a6574
3 changed files with 31 additions and 2 deletions
@@ -191,8 +191,8 @@ public class TypeSubstitutor {
                        substitutedType = typeVariable.substitutionResult(replacement.getType());
                    }
                    else {
-                        boolean resultingIsNullable = type.isNullable() || replacement.getType().isNullable();
-                        substitutedType = TypeUtils.makeNullableAsSpecified(replacement.getType(), resultingIsNullable);
+                        // this is a simple type T or T?: if it's T, we should just take replacement, if T? - we make replacement nullable
+                        substitutedType = type.isNullable() ? TypeUtils.makeNullable(replacement.getType()) : replacement.getType();
                    }

                    Variance resultingProjectionKind = combine(originalProjectionKind, replacement.getProjectionKind());