Merge branch 'master' into feature/collection-concurrent

Conflicts:
	src/library/scala/collection/JavaConversions.scala
	src/library/scala/collection/JavaConverters.scala

Add one test for concurrent map conversion.

1 files changed, 20 insertions, 0 deletions

diff --git a/test/files/neg/saferJavaConversions.scala b/test/files/neg/saferJavaConversions.scala
new file mode 100644
index 0000000000..f0611204e6
--- /dev/null
+++ b/test/files/neg/saferJavaConversions.scala
@@ -0,0 +1,20 @@
+
+case class Foo(s: String)
+
+object Test {
+  def f1 = {
+    import scala.collection.JavaConversions._
+    val map: Map[Foo, String] = Map(Foo("a") -> "a", Foo("b") -> "b")
+    val v = map.get("a")  // should be a type error, actually returns null
+  }
+  def f2 = {
+    import scala.collection.convert.wrapAsScala._
+    val map: Map[Foo, String] = Map(Foo("a") -> "a", Foo("b") -> "b")
+    val v = map.get("a")  // now this is a type error
+  }
+  def f3 = {
+    import scala.collection.convert.wrapAsJava._
+    val map: Map[Foo, String] = Map(Foo("a") -> "a", Foo("b") -> "b")
+    val v = map.get("a")
+  }
+}