From dceb81ed3e0ab04eccdbbe0a2eca49c50a48b443 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 25 Aug 2010 13:57:11 +0400
Subject: [PATCH] rollback incorrect optimization

---
 .../src/com/intellij/util/containers/ContainerUtil.java    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java
index e71235a0fd72..2d8dd438a358 100644
--- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java
+++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java
@@ -751,17 +751,14 @@ public class ContainerUtil {
 
   @NotNull
   public static <T, V> List<V> mapNotNull(Iterable<? extends T> iterable, Function<T, V> mapping) {
-    List<V> result = null;
+    List<V> result = new ArrayList<V>();
     for (T t : iterable) {
       final V o = mapping.fun(t);
       if (o != null) {
-        if (result == null ) {
-          result = new ArrayList<V>();
-        }
         result.add(o);
       }
     }
-    return result == null ? Collections.<V>emptyList() : result;
+    return result;
   }
 
   @NotNull