diff options
| author | Ichoran <ichoran@gmail.com> | 2015-01-30 14:54:51 -0800 |
|---|---|---|
| committer | Ichoran <ichoran@gmail.com> | 2015-01-30 14:54:51 -0800 |
| commit | 5d7098c629bbb7cc0ab7e74c235bd4afca3de24e (patch) | |
| tree | 4a43c8211e49010f89af14bbb968e964f32d7767 /src/library | |
| parent | 41a5f4517e981144c7f72fff1d465ab034b8196d (diff) | |
| parent | fb043761806f8ef2c7a662f15ba5ac5731426dbf (diff) | |
| download | scala-5d7098c629bbb7cc0ab7e74c235bd4afca3de24e.tar.gz scala-5d7098c629bbb7cc0ab7e74c235bd4afca3de24e.tar.bz2 scala-5d7098c629bbb7cc0ab7e74c235bd4afca3de24e.zip | |
Merge pull request #4259 from mzitnik/2.11.x
SI-9072 Vector ++ concatenation of parallel collection cause inconsisten...
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/collection/immutable/Vector.scala | 2 |
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 c7da447f72..47a623a616 100644 --- a/src/library/scala/collection/immutable/Vector.scala +++ b/src/library/scala/collection/immutable/Vector.scala @@ -215,7 +215,7 @@ override def companion: GenericCompanion[Vector] = Vector import Vector.{Log2ConcatFaster, TinyAppendFaster} if (that.isEmpty) this.asInstanceOf[That] else { - val again = if (!that.isTraversableAgain) that.toVector else that + val again = if (!that.isTraversableAgain) that.toVector else that.seq again.size match { // Often it's better to append small numbers of elements (or prepend if RHS is a vector) case n if n <= TinyAppendFaster || n < (this.size >> Log2ConcatFaster) => |