5632 patch

gistfile1.txt

--- a/src/library/scala/collection/mutable/HashTable.scala
+++ b/src/library/scala/collection/mutable/HashTable.scala
@@ -366,7 +366,7 @@ private[collection] object HashTable {
 
   private[collection] final def newThreshold(_loadFactor: Int, size: Int) = ((size.toLong * _loadFactor) / loadFactorDenum).toInt
 
-  private[collection] final def sizeForThreshold(_loadFactor: Int, thr: Int) = thr * loadFactorDenum / _loadFactor
+  private[collection] final def sizeForThreshold(_loadFactor: Int, thr: Int) = ((thr.toLong * loadFactorDenum) / _loadFactor).toInt
 
   private[collection] final def capacity(expectedSize: Int) = if (expectedSize == 0) 1 else powerOfTwo(expectedSize)

t5632.scala

import scala.collection.mutable._
import java.io._

object Test extends App {
  def test(size: Int) { 
    val map = new HashMap[Int,AnyRef]()
    map ++= (0 until size).view.map( _ -> null)
    val bout = new ByteArrayOutputStream()
    val oout = new ObjectOutputStream(bout)
    oout.writeObject(map)
    oout.close()
    val in = new ObjectInputStream(new ByteArrayInputStream(bout.toByteArray))
    in.readObject()
    in.close()
  }
  // works by default
  //test(2147483)
  // broken prior to fix with this commit
  test(2147484)
}