diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
index a1b1747ae286..f8d93600ff0f 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -950,7 +950,7 @@ public class CompileDriver {
             outputsToRefresh.add(generated.getSecond());
           }
 
-          RefreshQueue.getInstance().refresh(false, true, null, VfsUtilCore.toVirtualFileArray(outputsToRefresh));
+          RefreshQueue.getInstance().refresh(false, true, null, outputsToRefresh);
           if (progressIndicator.isCanceled()) {
             return ExitStatus.CANCELLED;
           }
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerUtil.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerUtil.java
index e462c98e08ba..1417fa69a0e2 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerUtil.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerUtil.java
@@ -124,7 +124,7 @@ public class CompilerUtil {
       }
     }
     if (!filesToRefresh.isEmpty()) {
-      RefreshQueue.getInstance().refresh(false, true, null, VfsUtil.toVirtualFileArray(filesToRefresh));
+      RefreshQueue.getInstance().refresh(false, true, null, filesToRefresh);
     }
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java
index b9f6a1f8e7d9..6a8c34c03abf 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java
@@ -95,9 +95,7 @@ public class JarFileSystemImpl extends JarFileSystem implements ApplicationCompo
                   ((NewVirtualFile)root).markDirtyRecursively();
                 }
               }
-
-              VirtualFile[] roots = VfsUtilCore.toVirtualFileArray(rootsToRefresh);
-              RefreshQueue.getInstance().refresh(false, true, null, roots);
+              RefreshQueue.getInstance().refresh(false, true, null, rootsToRefresh);
             }
           };
           if (app.isUnitTestMode()) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java
index 45943935a00f..d11963de9cd5 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java
@@ -42,7 +42,6 @@ import org.jetbrains.annotations.Nullable;
 
 import java.io.*;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
 
@@ -265,7 +264,7 @@ public abstract class LocalFileSystemBase extends LocalFileSystem {
         }
       }
 
-      RefreshQueue.getInstance().refresh(async, recursive, onFinish, VfsUtilCore.toVirtualFileArray(filesToRefresh));
+      RefreshQueue.getInstance().refresh(async, recursive, onFinish, filesToRefresh);
     }
     finally {
       if (fireCommonRefreshSession) manager.fireAfterRefreshFinish(false);
@@ -279,15 +278,7 @@ public abstract class LocalFileSystemBase extends LocalFileSystem {
 
   @Override
   public void refreshFiles(@NotNull Iterable<VirtualFile> files, boolean async, boolean recursive, @Nullable Runnable onFinish) {
-    final Collection<VirtualFile> collection;
-    if (files instanceof Collection) {
-      collection = (Collection<VirtualFile>)files;
-    }
-    else {
-      collection = new ArrayList<VirtualFile>();
-      ContainerUtil.addAll(collection, files);
-    }
-    RefreshQueue.getInstance().refresh(async, recursive, onFinish, VfsUtilCore.toVirtualFileArray(collection));
+    RefreshQueue.getInstance().refresh(async, recursive, onFinish, ContainerUtil.toCollection(files));
   }
 
   @Override
diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java
index 469886d077d8..f478a58f624b 100644
--- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java
+++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java
@@ -1698,4 +1698,9 @@ public class ContainerUtil extends ContainerUtilRt {
   public static <T> T[] toArray(@NotNull Collection<T> c, @NotNull T[] sample) {
     return ContainerUtilRt.toArray(c, sample);
   }
+
+  @NotNull
+  public static <T> Collection<T> toCollection(@NotNull Iterable<T> iterable) {
+    return iterable instanceof Collection ? (Collection<T>)iterable : newArrayList(iterable);
+  }
 }
diff --git a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
index c98d422ec81f..fa6c84afb38f 100644
--- a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
+++ b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
@@ -203,7 +203,7 @@ public class VcsUtil {
   }
 
   private static void refreshFiles(final List<VirtualFile> filesToRefresh, final Runnable runnable) {
-    RefreshQueue.getInstance().refresh(true, true, runnable, VfsUtil.toVirtualFileArray(filesToRefresh));
+    RefreshQueue.getInstance().refresh(true, true, runnable, filesToRefresh);
   }
 
   private static List<VirtualFile> collectFilesToRefresh(final File[] roots) {