summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorRex Kerr <ichoran@gmail.com>2013-12-02 15:00:20 -0800
committerRex Kerr <ichoran@gmail.com>2013-12-02 15:00:20 -0800
commit03bf97e0893b227812125f7c049fdac254181cb2 (patch)
tree6107017bc3885c0f60c5348d8185c5c749371d7a /src/library
parent6c63ab153651f7946ece5740d52e0f2b701e349d (diff)
downloadscala-03bf97e0893b227812125f7c049fdac254181cb2.tar.gz
scala-03bf97e0893b227812125f7c049fdac254181cb2.tar.bz2
scala-03bf97e0893b227812125f7c049fdac254181cb2.zip
Fixes SI-8014, regression in Vector ++ TraversableOnce.
Now uses the cached copy instead of the exhausted iterator. Adds a JUnit test for ++.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/collection/immutable/Vector.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/collection/immutable/Vector.scala b/src/library/scala/collection/immutable/Vector.scala
index 0a100578c0..3dc1ad6a79 100644
--- a/src/library/scala/collection/immutable/Vector.scala
+++ b/src/library/scala/collection/immutable/Vector.scala
@@ -227,7 +227,7 @@ override def companion: GenericCompanion[Vector] = Vector
val ri = this.reverseIterator
while (ri.hasNext) v = ri.next +: v
v.asInstanceOf[That]
- case _ => super.++(that)
+ case _ => super.++(again)
}
}
}