summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-07-17 16:00:36 +0000
committerPaul Phillips <paulp@improving.org>2009-07-17 16:00:36 +0000
commit6581c02a2ecfe72ba9403c805c94f7d73027b80c (patch)
tree20b6e28a746583f6c0059a7c8cc70a8463dd8faa /src
parent3355ead4eb75d2bc1f02300b82d154c76191a48a (diff)
downloadscala-6581c02a2ecfe72ba9403c805c94f7d73027b80c.tar.gz
scala-6581c02a2ecfe72ba9403c805c94f7d73027b80c.tar.bz2
scala-6581c02a2ecfe72ba9403c805c94f7d73027b80c.zip
Fix for failing test t1323.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/collection/generic/SequenceTemplate.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/collection/generic/SequenceTemplate.scala b/src/library/scala/collection/generic/SequenceTemplate.scala
index ee0f94a583..ecc65ebf15 100644
--- a/src/library/scala/collection/generic/SequenceTemplate.scala
+++ b/src/library/scala/collection/generic/SequenceTemplate.scala
@@ -320,7 +320,7 @@ trait SequenceTemplate[+A, +This <: IterableTemplate[A, This] with Sequence[A]]
def indexOfSeq[B >: A](that: Sequence[B]): Int = indexOfSeq(that, 0)
def indexOfSeq[B >: A](that: Sequence[B], fromIndex: Int): Int =
- if (that.hasDefiniteSize)
+ if (thisCollection.hasDefiniteSize && that.hasDefiniteSize)
indexOf_KMP(thisCollection, 0, length, that, 0, that.length, fromIndex)
else {
var i = fromIndex