Merge pull request #2124 from adriaanm/76f167388a42e9bb8b72645d87bcb408b6981576

merge 2.10.x

2 files changed, 26 insertions, 0 deletions

diff --git a/test/files/run/t6370.scala b/test/files/run/t6370.scala
new file mode 100644
index 0000000000..c86b87dc8a
--- /dev/null
+++ b/test/files/run/t6370.scala
@@ -0,0 +1,12 @@
+object Test {
+
+  def main(args: Array[String]): Unit = {
+      val m = collection.immutable.ListMap( "x" -> 1 )
+      try {
+         m("y")
+      } catch {
+         case e : NoSuchElementException => assert(e.getMessage() == "key not found: y")
+      }
+
+  }
+}
diff --git a/test/files/run/t6935.scala b/test/files/run/t6935.scala
new file mode 100644
index 0000000000..dea2d7f2e2
--- /dev/null
+++ b/test/files/run/t6935.scala
@@ -0,0 +1,14 @@
+object Test {
+
+  def main(args: Array[String]): Unit = {
+		  import java.io._
+		  val bytes = new ByteArrayOutputStream()
+		  val out = new ObjectOutputStream(bytes)
+		  out.writeObject(())
+		  out.close()
+		  val buf = bytes.toByteArray
+		  val in = new ObjectInputStream(new ByteArrayInputStream(buf))
+		  val unit = in.readObject()
+		  assert(unit == ())
+  }
+}