Rewrite Iterables.toArray to work correctly in the presence of concur…

…rent modification (#1558). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=105071914
google · Oct 12, 2015 · 0cdfef6 · 0cdfef6
1 parent 80b78c8
commit 0cdfef6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/Iterables.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/Iterables.java
@@ -295,7 +295,7 @@ public static <T> T getOnlyElement(Iterable<? extends T> iterable, @Nullable T d
   }
 
   static <T> T[] toArray(Iterable<? extends T> iterable, T[] array) {
-    Collection<? extends T> collection = toCollection(iterable);
+    Collection<? extends T> collection = castOrCopyToCollection(iterable);
     return collection.toArray(array);
   }
 
@@ -307,15 +307,15 @@ static <T> T[] toArray(Iterable<? extends T> iterable, T[] array) {
    *     have been copied
    */
   static Object[] toArray(Iterable<?> iterable) {
-    return toCollection(iterable).toArray();
+    return castOrCopyToCollection(iterable).toArray();
   }
 
   /**
    * Converts an iterable into a collection. If the iterable is already a
    * collection, it is returned. Otherwise, an {@link java.util.ArrayList} is
    * created with the contents of the iterable in the same iteration order.
    */
-  private static <E> Collection<E> toCollection(Iterable<E> iterable) {
+  private static <E> Collection<E> castOrCopyToCollection(Iterable<E> iterable) {
     return (iterable instanceof Collection)
         ? (Collection<E>) iterable
         : Lists.newArrayList(iterable.iterator());

diff --git a/guava/src/com/google/common/collect/Iterables.java b/guava/src/com/google/common/collect/Iterables.java
@@ -306,13 +306,11 @@ public static <T> T getOnlyElement(Iterable<? extends T> iterable, @Nullable T d
    */
   @GwtIncompatible("Array.newInstance(Class, int)")
   public static <T> T[] toArray(Iterable<? extends T> iterable, Class<T> type) {
-    Collection<? extends T> collection = toCollection(iterable);
+    return toArray(iterable, ObjectArrays.newArray(type, 0));
-    T[] array = ObjectArrays.newArray(type, collection.size());
-    return collection.toArray(array);
   }
 
   static <T> T[] toArray(Iterable<? extends T> iterable, T[] array) {
-    Collection<? extends T> collection = toCollection(iterable);
+    Collection<? extends T> collection = castOrCopyToCollection(iterable);
     return collection.toArray(array);
   }
 
@@ -324,15 +322,15 @@ static <T> T[] toArray(Iterable<? extends T> iterable, T[] array) {
    *     have been copied
    */
   static Object[] toArray(Iterable<?> iterable) {
-    return toCollection(iterable).toArray();
+    return castOrCopyToCollection(iterable).toArray();
   }
 
   /**
    * Converts an iterable into a collection. If the iterable is already a
    * collection, it is returned. Otherwise, an {@link java.util.ArrayList} is
    * created with the contents of the iterable in the same iteration order.
    */
-  private static <E> Collection<E> toCollection(Iterable<E> iterable) {
+  private static <E> Collection<E> castOrCopyToCollection(Iterable<E> iterable) {
     return (iterable instanceof Collection)
         ? (Collection<E>) iterable
         : Lists.newArrayList(iterable.iterator());