From 041f4d6e348647d6b04735d90c61298deb269ce4 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 4 Sep 2014 13:42:45 +0400
Subject: [PATCH] EA-60119 - IAE: PsiCapturedWildcardType.create

---
 java/java-psi-api/src/com/intellij/psi/GenericsUtil.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java b/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
index c835a4171f74..4646aea635b3 100644
--- a/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
@@ -262,7 +262,9 @@ public class GenericsUtil {
     for (PsiTypeParameter typeParameter : typeParams) {
       PsiType substituted = substitutor.substitute(typeParameter);
       if (substituted == null) return null;
-      substituted = PsiUtil.captureToplevelWildcards(substituted, context);
+      if (context != null) {
+        substituted = PsiUtil.captureToplevelWildcards(substituted, context);
+      }
 
       PsiClassType[] extendsTypes = typeParameter.getExtendsListTypes();
       for (PsiClassType type : extendsTypes) {