Fixing a parallel sets issue with flatmap.

2 files changed, 5 insertions, 3 deletions

diff --git a/src/library/scala/collection/mutable/FlatHashTable.scala b/src/library/scala/collection/mutable/FlatHashTable.scala
index f2e42f2ca1..d74c5f3c4d 100644
--- a/src/library/scala/collection/mutable/FlatHashTable.scala
+++ b/src/library/scala/collection/mutable/FlatHashTable.scala
@@ -279,7 +279,7 @@ trait FlatHashTable[A] extends FlatHashTable.HashUtils[A] {
     // improve(hcode) & (table.length - 1)
     val improved = improve(hcode)
     val ones = table.length - 1
-    (improved >> (32 - java.lang.Integer.bitCount(ones))) & ones
+    (improved >>> (32 - java.lang.Integer.bitCount(ones))) & ones
   }
 
   protected def clearTable() {
diff --git a/src/library/scala/collection/parallel/package.scala b/src/library/scala/collection/parallel/package.scala
index decae62dd2..7c83d43487 100644
--- a/src/library/scala/collection/parallel/package.scala
+++ b/src/library/scala/collection/parallel/package.scala
@@ -121,8 +121,10 @@ package object parallel {
   /* classes */
 
   /** Composite throwable - thrown when multiple exceptions are thrown at the same time. */
-  final class CompositeThrowable(val throwables: Set[Throwable])
-  extends Throwable("Multiple exceptions thrown during a parallel computation: " + throwables.map(t => (t, t.getStackTrace.toList)).mkString(", "))
+  final case class CompositeThrowable(val throwables: Set[Throwable])
+  extends Throwable("Multiple exceptions thrown during a parallel computation: " + throwables.map(
+    t => t + "\n" + t.getStackTrace.take(10).++("...").mkString("\n")
+  ).mkString("\n\n"))
 
 
   /** A helper iterator for iterating very small array buffers.