diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-01-13 10:22:32 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-01-13 10:22:32 -0800 |
| commit | 0a43c263568760ad291cbc76a98e1eb2de9292a7 (patch) | |
| tree | 7b8b1424ed4bc48f8e16f5195786fc613d477226 /src/library | |
| parent | 503dfc54e9d1f30f6fd9fd0c4e3cd80aad6e2f1d (diff) | |
| parent | ad594604ed3a91371ba99a4fb9e8ce7f87f4635b (diff) | |
| download | scala-0a43c263568760ad291cbc76a98e1eb2de9292a7.tar.gz scala-0a43c263568760ad291cbc76a98e1eb2de9292a7.tar.bz2 scala-0a43c263568760ad291cbc76a98e1eb2de9292a7.zip | |
Merge pull request #3303 from Ichoran/issue/6615
Fixes SI-6615, NPE on slice of PagedSeq.
Diffstat (limited to 'src/library')
| -rw-r--r-- | src/library/scala/collection/immutable/PagedSeq.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/library/scala/collection/immutable/PagedSeq.scala b/src/library/scala/collection/immutable/PagedSeq.scala index 589661a343..3a64820be6 100644 --- a/src/library/scala/collection/immutable/PagedSeq.scala +++ b/src/library/scala/collection/immutable/PagedSeq.scala @@ -188,7 +188,10 @@ extends scala.collection.AbstractSeq[T] val s = start + _start val e = if (_end == UndeterminedEnd) _end else start + _end var f = first1 - while (f.end <= s && !f.isLast) f = f.next + while (f.end <= s && !f.isLast) { + if (f.next eq null) f.addMore(more) + f = f.next + } new PagedSeq(more, f, s, e) } |