summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/convert
diff options
context:
space:
mode:
authorIlya Maykov <ivmaykov@gmail.com>2013-09-30 16:45:48 -0700
committerIlya Maykov <ivmaykov@gmail.com>2013-10-01 16:39:32 -0700
commit55a558a50bf4e020db6de2cd0bd9dbe2e5179eda (patch)
tree28e03f58df49491c39afe2d4a3428eb063e8eb45 /src/library/scala/collection/convert
parent2bba7797028a19b541b5bd88bd2b732e9a58681c (diff)
downloadscala-55a558a50bf4e020db6de2cd0bd9dbe2e5179eda.tar.gz
scala-55a558a50bf4e020db6de2cd0bd9dbe2e5179eda.tar.bz2
scala-55a558a50bf4e020db6de2cd0bd9dbe2e5179eda.zip
SI-7883 - don't iterate over all keys in MapWrapper.containsKey()
Diffstat (limited to 'src/library/scala/collection/convert')
-rw-r--r--src/library/scala/collection/convert/Wrappers.scala6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/library/scala/collection/convert/Wrappers.scala b/src/library/scala/collection/convert/Wrappers.scala
index 4410ddc7d8..6dab7c0e02 100644
--- a/src/library/scala/collection/convert/Wrappers.scala
+++ b/src/library/scala/collection/convert/Wrappers.scala
@@ -212,6 +212,12 @@ private[collection] trait Wrappers {
}
}
}
+
+ override def containsKey(key: AnyRef): Boolean = try {
+ underlying.contains(key.asInstanceOf[A])
+ } catch {
+ case ex: ClassCastException => false
+ }
}
case class MutableMapWrapper[A, B](underlying: mutable.Map[A, B]) extends MapWrapper[A, B](underlying) {