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, 36 insertions, 0 deletions

diff --git a/test/files/run/concurrent-map-conversions.scala b/test/files/run/concurrent-map-conversions.scala
new file mode 100644
index 0000000000..0350b69642
--- /dev/null
+++ b/test/files/run/concurrent-map-conversions.scala
@@ -0,0 +1,36 @@
+
+
+
+
+
+object Test {
+  
+  def main(args: Array[String]) {
+    testConversions()
+    testConverters()
+  }
+  
+  def needPackageConcurrentMap(map: collection.concurrent.Map[Int, Int]) {
+  }
+  def needJavaConcurrent(map: java.util.concurrent.ConcurrentMap[Int, Int]) {
+  }
+  
+  def testConversions() {
+    import collection.JavaConversions._
+    val skiplist = new java.util.concurrent.ConcurrentSkipListMap[Int, Int]
+    val ctrie = new collection.concurrent.TrieMap[Int, Int]
+    
+    needPackageConcurrentMap(skiplist)
+    needJavaConcurrent(ctrie)
+  }
+  
+  def testConverters() {
+    import collection.JavaConverters._
+    val skiplist = new java.util.concurrent.ConcurrentSkipListMap[Int, Int]
+    val ctrie = new collection.concurrent.TrieMap[Int, Int]
+    
+    needPackageConcurrentMap(skiplist.asScala)
+    needJavaConcurrent(ctrie.asJava)
+  }
+  
+}