From f38e545bcb0e091ea99fa38681d4c1db9114a646 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 12 Jun 2015 18:13:15 +0300
Subject: [PATCH] replace duplicate

---
 .../src/com/intellij/psi/util/PsiUtil.java    | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
index 1ad78b799a19..3eea64f740fa 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
@@ -812,26 +812,13 @@ public final class PsiUtil extends PsiUtilCore {
         }
       }
 
-      if (glb != null) {
-        if (!((PsiWildcardType)substituted).isSuper()) {
-          substituted = glb instanceof PsiCapturedWildcardType ? ((PsiCapturedWildcardType)glb).getWildcard()
-                                                               : PsiWildcardType.createExtends(manager, glb);
-        }
-        else {
-          if (captureContext != null) {
-            final PsiCapturedWildcardType capturedWildcardType = oldSubstituted instanceof PsiCapturedWildcardType
-                                                                 ? (PsiCapturedWildcardType)oldSubstituted
-                                                                 : (PsiCapturedWildcardType)captureSubstitutor.substitute(typeParameter);
-            LOG.assertTrue(capturedWildcardType != null);
-            capturedWildcardType.setUpperBound(glb);
-            return capturedWildcardType;
-          }
-        }
+      if (glb != null && !((PsiWildcardType)substituted).isSuper()) {
+        substituted = glb instanceof PsiCapturedWildcardType ? ((PsiCapturedWildcardType)glb).getWildcard()
+                                                             : PsiWildcardType.createExtends(manager, glb);
       }
     }
 
     if (captureContext != null) {
-      LOG.assertTrue(substituted instanceof PsiWildcardType, substituted);
       substituted =
         oldSubstituted instanceof PsiCapturedWildcardType && substituted.equals(((PsiCapturedWildcardType)oldSubstituted).getWildcard())
         ? oldSubstituted