2 files changed, 38 insertions, 3 deletions

diff --git a/src/library/scala/collection/immutable/ListMap.scala b/src/library/scala/collection/immutable/ListMap.scala
index 7c40e84280..c5773338f5 100644
--- a/src/library/scala/collection/immutable/ListMap.scala
+++ b/src/library/scala/collection/immutable/ListMap.scala
@@ -29,7 +29,11 @@ object ListMap extends ImmutableMapFactory[ListMap] {
     new MapCanBuildFrom[A, B]
   def empty[A, B]: ListMap[A, B] = EmptyListMap.asInstanceOf[ListMap[A, B]]
 
-  private object EmptyListMap extends ListMap[Any, Nothing] { }
+  @SerialVersionUID(-8256686706655863282L)
+  private object EmptyListMap extends ListMap[Any, Nothing] { 
+    override def apply(key: Any) = throw new NoSuchElementException("key not found: " + key)
+    override def contains(key: Any) = false
+  }
 }
 
 /** This class implements immutable maps using a list-based data structure.
@@ -159,7 +163,6 @@ extends AbstractMap[A, B]
      */
     override def apply(k: A): B1 = apply0(this, k)
 
-
     @tailrec private def apply0(cur: ListMap[A, B1], k: A): B1 =
       if (cur.isEmpty) throw new NoSuchElementException("key not found: "+k)
       else if (k == cur.key) cur.value
@@ -176,7 +179,16 @@ extends AbstractMap[A, B]
     @tailrec private def get0(cur: ListMap[A, B1], k: A): Option[B1] =
       if (k == cur.key) Some(cur.value)
       else if (cur.next.nonEmpty) get0(cur.next, k) else None
-
+      
+      
+    override def contains(key: A): Boolean = contains0(this, key)
+    
+    @tailrec private def contains0(cur: ListMap[A, B1], k: A): Boolean =
+      if (k == cur.key) true
+      else if (cur.next.nonEmpty) contains0(cur.next, k)
+      else false
+
+      
     /** This method allows one to create a new map with an additional mapping
      *  from `key` to `value`. If the map contains already a mapping for `key`,
      *  it will be overridden by this function.
@@ -186,6 +198,7 @@ extends AbstractMap[A, B]
       new m.Node[B2](k, v)
     }
 
+    
     /** Creates a new mapping without the given `key`.
      *  If the map does not contain a mapping for the given key, the
      *  method returns the same map.
diff --git a/src/library/scala/collection/immutable/Map.scala b/src/library/scala/collection/immutable/Map.scala
index 5178d5a862..63ddcb18cf 100644
--- a/src/library/scala/collection/immutable/Map.scala
+++ b/src/library/scala/collection/immutable/Map.scala
@@ -94,6 +94,8 @@ object Map extends ImmutableMapFactory[Map] {
 
   private object EmptyMap extends AbstractMap[Any, Nothing] with Map[Any, Nothing] with Serializable {
     override def size: Int = 0
+    override def apply(key: Any) = throw new NoSuchElementException("key not found: " + key)
+    override def contains(key: Any) = false
     def get(key: Any): Option[Nothing] = None
     def iterator: Iterator[(Any, Nothing)] = Iterator.empty
     override def updated [B1] (key: Any, value: B1): Map[Any, B1] = new Map1(key, value)
@@ -103,6 +105,8 @@ object Map extends ImmutableMapFactory[Map] {
 
   class Map1[A, +B](key1: A, value1: B) extends AbstractMap[A, B] with Map[A, B] with Serializable {
     override def size = 1
+    override def apply(key: A) = if (key == key1) value1 else throw new NoSuchElementException("key not found: " + key)
+    override def contains(key: A) = key == key1
     def get(key: A): Option[B] =
       if (key == key1) Some(value1) else None
     def iterator = Iterator((key1, value1))
@@ -119,6 +123,11 @@ object Map extends ImmutableMapFactory[Map] {
 
   class Map2[A, +B](key1: A, value1: B, key2: A, value2: B) extends AbstractMap[A, B] with Map[A, B] with Serializable {
     override def size = 2
+    override def apply(key: A) =
+      if (key == key1) value1
+      else if (key == key2) value2
+      else throw new NoSuchElementException("key not found: " + key)
+    override def contains(key: A) = (key == key1) || (key == key2)
     def get(key: A): Option[B] =
       if (key == key1) Some(value1)
       else if (key == key2) Some(value2)
@@ -140,6 +149,12 @@ object Map extends ImmutableMapFactory[Map] {
 
   class Map3[A, +B](key1: A, value1: B, key2: A, value2: B, key3: A, value3: B) extends AbstractMap[A, B] with Map[A, B] with Serializable {
     override def size = 3
+    override def apply(key: A) =
+      if (key == key1) value1
+      else if (key == key2) value2
+      else if (key == key3) value3
+      else throw new NoSuchElementException("key not found: " + key)
+    override def contains(key: A) = (key == key1) || (key == key2) || (key == key3)
     def get(key: A): Option[B] =
       if (key == key1) Some(value1)
       else if (key == key2) Some(value2)
@@ -164,6 +179,13 @@ object Map extends ImmutableMapFactory[Map] {
 
   class Map4[A, +B](key1: A, value1: B, key2: A, value2: B, key3: A, value3: B, key4: A, value4: B) extends AbstractMap[A, B] with Map[A, B] with Serializable {
     override def size = 4
+    override def apply(key: A) =
+      if (key == key1) value1
+      else if (key == key2) value2
+      else if (key == key3) value3
+      else if (key == key4) value4
+      else throw new NoSuchElementException("key not found: " + key)
+    override def contains(key: A) = (key == key1) || (key == key2) || (key == key3) || (key == key4)
     def get(key: A): Option[B] =
       if (key == key1) Some(value1)
       else if (key == key2) Some(value2)