From 55a558a50bf4e020db6de2cd0bd9dbe2e5179eda Mon Sep 17 00:00:00 2001 From: Ilya Maykov Date: Mon, 30 Sep 2013 16:45:48 -0700 Subject: SI-7883 - don't iterate over all keys in MapWrapper.containsKey() --- src/library/scala/collection/convert/Wrappers.scala | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/library') 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) { -- cgit v1.2.3 From f38f762fc645ad24f5c9a297a6e62a75e9fa4b94 Mon Sep 17 00:00:00 2001 From: Ilya Maykov Date: Thu, 3 Oct 2013 14:42:54 -0700 Subject: SI-7883: Added a comment per CR feedback from @adriaanm, @Ichoran --- src/library/scala/collection/convert/Wrappers.scala | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/library') diff --git a/src/library/scala/collection/convert/Wrappers.scala b/src/library/scala/collection/convert/Wrappers.scala index 6dab7c0e02..56f1802509 100644 --- a/src/library/scala/collection/convert/Wrappers.scala +++ b/src/library/scala/collection/convert/Wrappers.scala @@ -214,6 +214,9 @@ private[collection] trait Wrappers { } override def containsKey(key: AnyRef): Boolean = try { + // Note: Subclass of collection.Map with specific key type may redirect generic + // contains to specific contains, which will throw a ClassCastException if the + // wrong type is passed. This is why we need a type cast to A inside a try/catch. underlying.contains(key.asInstanceOf[A]) } catch { case ex: ClassCastException => false -- cgit v1.2.3