summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/runtime/BoxedArray.scala4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/library/scala/runtime/BoxedArray.scala b/src/library/scala/runtime/BoxedArray.scala
index d0555e8e62..f3193ec017 100644
--- a/src/library/scala/runtime/BoxedArray.scala
+++ b/src/library/scala/runtime/BoxedArray.scala
@@ -99,9 +99,7 @@ abstract class BoxedArray extends Array.Array0[Any] {
final override def ++[b >: Any](that: Iterable[b]): Array[b] = super.++(that).toArray
final def zip[b](that: Array[b]): Array[Tuple2[Any,b]] = {
- val len = length
- if(len != that.length)
- throw new Error("zipping arrays of different length")
+ val len = length min that.length
val result = new Array[Tuple2[Any,b]](len)
var i = 0
while (i < len) {