summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2009-01-21 15:42:00 +0000
committerIulian Dragos <jaguarul@gmail.com>2009-01-21 15:42:00 +0000
commit5acdeccf69b1ce7a04c5ce0e4cfa196794944d3b (patch)
tree856ea4d73da65809fa236c862733b74f862e1420
parent7f79d491a07472804fd9ce9d836183d026faf52b (diff)
downloadscala-5acdeccf69b1ce7a04c5ce0e4cfa196794944d3b.tar.gz
scala-5acdeccf69b1ce7a04c5ce0e4cfa196794944d3b.tar.bz2
scala-5acdeccf69b1ce7a04c5ce0e4cfa196794944d3b.zip
Propagated fix for #216
-rw-r--r--src/library/scala/runtime/ScalaRunTime.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala
index c98fd33c6a..bee37d44c1 100644
--- a/src/library/scala/runtime/ScalaRunTime.scala
+++ b/src/library/scala/runtime/ScalaRunTime.scala
@@ -86,7 +86,8 @@ object ScalaRunTime {
val arr = x.productArity
var i = 0
while (i < arr) {
- code = code * 41 + x.productElement(i).hashCode()
+ val elem = x.productElement(i)
+ code = code * 41 + (if (elem eq null) 0 else elem.hashCode())
i += 1
}
code