NPE: check raw substitution during inline

java/java-impl/src/com/intellij/refactoring/util/InlineUtil.java

@@ -289,6 +289,9 @@ public class InlineUtil {
           PsiElement resolved = resolveResult.getElement();
           if (resolved instanceof PsiTypeParameter) {
             PsiType newType = resolveResult.getSubstitutor().putAll(substitutor).substitute((PsiTypeParameter)resolved);
+            if (newType == null) {
+              newType = PsiType.getJavaLangObject(resolved.getManager(), resolved.getResolveScope());
+            }
             try {
               typeElement.replace(factory.createTypeElement(newType));
               return;

java/java-tests/testData/refactoring/inlineMethod/RawSubstitution.java

@@ -0,0 +1,16 @@
+public class NotRaw<T> {
+    T g<caret>et(T t){
+        T tt = t;
+        if ( t == null) {
+            return null;
+        }           else
+        return null;
+    }
+
+}
+
+class Raw extends NotRaw {
+    void foo() {
+        Object o = get(null);
+    }
+}

java/java-tests/testData/refactoring/inlineMethod/RawSubstitution.java.after

@@ -0,0 +1,15 @@
+public class NotRaw<T> {
+
+}
+
+class Raw extends NotRaw {
+    void foo() {
+        Object result;
+        Object tt = null;
+        if ( null == null) {
+            result = null;
+        }           else
+            result = null;
+        Object o = result;
+    }
+}

java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java

@@ -153,6 +153,10 @@ public class InlineMethodTest extends LightCodeInsightTestCase {
     doTest();
   }
 
+  public void testRawSubstitution() throws Exception {
+    doTest();
+  }
+
   @Override
   protected Sdk getProjectJDK() {
     return JavaSdkImpl.getMockJdk15("java 1.5");