summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVinicius Miana <vinicius@miana.com.br>2013-02-08 19:00:21 -0200
committerVinicius Miana <vinicius@miana.com.br>2013-02-08 19:09:00 -0200
commitc049d66c54c4f255bc0de70b2fd4ec559df7ebcd (patch)
tree0d64e514307ad5fb10a56edb56d4f8cc31f89733 /src
parent6537d79e47def868e028815db6f70e2dc7d49bac (diff)
downloadscala-c049d66c54c4f255bc0de70b2fd4ec559df7ebcd.tar.gz
scala-c049d66c54c4f255bc0de70b2fd4ec559df7ebcd.tar.bz2
scala-c049d66c54c4f255bc0de70b2fd4ec559df7ebcd.zip
SI-6935 Added readResolve in BoxedUnit
When deserializing Unit, it would return an instance of Object, but not a Scala Unit. By adding readResolve, the deserialization of Unit will work.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/runtime/BoxedUnit.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/library/scala/runtime/BoxedUnit.java b/src/library/scala/runtime/BoxedUnit.java
index 035c05d12a..f436b7c209 100644
--- a/src/library/scala/runtime/BoxedUnit.java
+++ b/src/library/scala/runtime/BoxedUnit.java
@@ -17,6 +17,8 @@ public final class BoxedUnit implements java.io.Serializable {
public final static BoxedUnit UNIT = new BoxedUnit();
public final static Class<Void> TYPE = java.lang.Void.TYPE;
+
+ private Object readResolve() { return UNIT; }
private BoxedUnit() { }