Merge 2.10.x into master.

Conflicts:
	src/library/scala/collection/mutable/ArrayOps.scala

1 files changed, 13 insertions, 10 deletions

diff --git a/src/library/scala/collection/mutable/ArrayOps.scala b/src/library/scala/collection/mutable/ArrayOps.scala
index fcbfd27738..4c996bfb88 100644
--- a/src/library/scala/collection/mutable/ArrayOps.scala
+++ b/src/library/scala/collection/mutable/ArrayOps.scala
@@ -90,18 +90,21 @@ trait ArrayOps[T] extends Any with ArrayLike[T, Array[T]] with CustomParalleliza
    *  @return         An array obtained by replacing elements of this arrays with rows the represent.
    */
   def transpose[U](implicit asArray: T => Array[U]): Array[Array[U]] = {
-    def mkRowBuilder() = Array.newBuilder(ClassTag[U](arrayElementClass(elementClass)))
-    val bs = asArray(head) map (_ => mkRowBuilder())
-    for (xs <- this) {
-      var i = 0
-      for (x <- asArray(xs)) {
-        bs(i) += x
-        i += 1
+    val bb: Builder[Array[U], Array[Array[U]]] = Array.newBuilder(ClassTag[Array[U]](elementClass))
+    if (isEmpty) bb.result()
+    else {
+      def mkRowBuilder() = Array.newBuilder(ClassTag[U](arrayElementClass(elementClass)))
+      val bs = asArray(head) map (_ => mkRowBuilder())
+      for (xs <- this) {
+        var i = 0
+        for (x <- asArray(xs)) {
+          bs(i) += x
+          i += 1
+        }
       }
+      for (b <- bs) bb += b.result()
+      bb.result()
     }
-    val bb: Builder[Array[U], Array[Array[U]]] = Array.newBuilder(ClassTag[Array[U]](elementClass))
-    for (b <- bs) bb += b.result
-    bb.result()
   }
 
   def seq = thisCollection