From eaf77e0975d703f8a48539b5567e4867490f8573 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 16 May 2012 20:13:36 +0400
Subject: [PATCH] EA-36142 - NPE: TypeConversionUtil.visitArrayType

---
 .../src/com/intellij/psi/util/TypeConversionUtil.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
index f3755f9edf20..ca6169fec37a 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
@@ -1213,7 +1213,7 @@ public class TypeConversionUtil {
         final PsiType componentType = ellipsisType.getComponentType();
         final PsiType newComponentType = componentType.accept(this);
         if (newComponentType == componentType) return ellipsisType;
-        return new PsiArrayType(newComponentType);
+        return newComponentType != null ? newComponentType.createArrayType() : null;
       }
 
       @Override
@@ -1221,7 +1221,7 @@ public class TypeConversionUtil {
         final PsiType componentType = arrayType.getComponentType();
         final PsiType newComponentType = componentType.accept(this);
         if (newComponentType == componentType) return arrayType;
-        return newComponentType.createArrayType();
+        return newComponentType != null ? newComponentType.createArrayType() : null;
       }
 
       @Override