Merge pull request #3704 from gourlaysama/wip/t8504

SI-8504 fix NPE in the Java wrapper for a Scala Map.

1 files changed, 10 insertions, 0 deletions

diff --git a/test/junit/scala/collection/convert/MapWrapperTest.scala b/test/junit/scala/collection/convert/MapWrapperTest.scala
index 060b6b5937..22eaf858ea 100644
--- a/test/junit/scala/collection/convert/MapWrapperTest.scala
+++ b/test/junit/scala/collection/convert/MapWrapperTest.scala
@@ -46,4 +46,14 @@ class MapWrapperTest {
     assertFalse(javaMap.containsKey(null))       // negative test, null key
     assertEquals(4, scalaMap.containsCounter)
   }
+
+  // test for SI-8504
+  @Test
+  def testHashCode() {
+    import scala.collection.JavaConverters._
+    val javaMap = Map(1 -> null).asJava
+
+    // Before the fix for SI-8504, this throws a NPE
+    javaMap.hashCode
+  }
 }