summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-02-14 15:10:58 +0100
committerJason Zaugg <jzaugg@gmail.com>2013-02-14 15:34:58 +0100
commit348ff4b6176a379dba943a6b6e0dbc71410f454f (patch)
tree0efaf0266bf97e4fd5d4893045381a95887edf53 /src/library
parentcc89bd71edfd4c88ca1099891e6c20b77379122a (diff)
downloadscala-348ff4b6176a379dba943a6b6e0dbc71410f454f.tar.gz
scala-348ff4b6176a379dba943a6b6e0dbc71410f454f.tar.bz2
scala-348ff4b6176a379dba943a6b6e0dbc71410f454f.zip
SI-7128 Fix regression in copyToArray for empty arrays
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/collection/Iterator.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/collection/Iterator.scala b/src/library/scala/collection/Iterator.scala
index 696bc4ab5c..2bb5bd1df9 100644
--- a/src/library/scala/collection/Iterator.scala
+++ b/src/library/scala/collection/Iterator.scala
@@ -1111,7 +1111,7 @@ trait Iterator[+A] extends TraversableOnce[A] {
* $willNotTerminateInf
*/
def copyToArray[B >: A](xs: Array[B], start: Int, len: Int): Unit = {
- require(start >= 0 && start < xs.length, s"start $start out of range ${xs.length}")
+ require(start >= 0 && (start < xs.length || xs.length == 0), s"start $start out of range ${xs.length}")
var i = start
val end = start + math.min(len, xs.length - start)
while (i < end && hasNext) {