From c19a212d1fb9d50b438d3ed0c1a27dc0c5ff7272 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 8 Jun 2012 17:02:06 +0400
Subject: [PATCH] EA-36502 - IAE: ArrayUtil.mergeArrays

---
 .../intellij/refactoring/copy/CopyClassesHandler.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
index aae30f20540f..ff4bc6f5b392 100644
--- a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
@@ -138,10 +138,14 @@ public class CopyClassesHandler extends CopyHandlerDelegateBase {
 
   private static void fillResultsMap(Map<PsiFile, PsiClass[]> result, PsiFile containingFile, PsiClass[] topLevelClasses) {
     PsiClass[] classes = result.get(containingFile);
-    if (classes != null) {
-      topLevelClasses = ArrayUtil.mergeArrays(classes, topLevelClasses, PsiClass.ARRAY_FACTORY);
+    if (topLevelClasses != null) {
+      if (classes != null) {
+        topLevelClasses = ArrayUtil.mergeArrays(classes, topLevelClasses, PsiClass.ARRAY_FACTORY);
+      }
+      result.put(containingFile, topLevelClasses);
+    } else {
+      result.put(containingFile, classes);
     }
-    result.put(containingFile, topLevelClasses);
   }
 
   public void doCopy(PsiElement[] elements, PsiDirectory defaultTargetDirectory) {