summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorJames Iry <jamesiry@gmail.com>2013-02-11 11:07:47 -0800
committerJames Iry <jamesiry@gmail.com>2013-02-11 11:07:47 -0800
commit8bf9bbf557c2ce0778327f82e4599ddea97a3da8 (patch)
tree24ba7b8146a1138acac3556b133ef87d6df6ae29 /src/library
parent74fc185bcdc37f6a5362e499cb4adf42c18e89e6 (diff)
parentc049d66c54c4f255bc0de70b2fd4ec559df7ebcd (diff)
downloadscala-8bf9bbf557c2ce0778327f82e4599ddea97a3da8.tar.gz
scala-8bf9bbf557c2ce0778327f82e4599ddea97a3da8.tar.bz2
scala-8bf9bbf557c2ce0778327f82e4599ddea97a3da8.zip
Merge pull request #2097 from ViniciusMiana/SI-6935
SI-6935 Added readResolve in BoxedUnit
Diffstat (limited to 'src/library')
-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() { }