diff options
| -rw-r--r-- | src/library/scala/runtime/BoxedUnit.java | 2 | ||||
| -rw-r--r-- | test/files/run/t6935.scala | 14 |
2 files changed, 16 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() { } diff --git a/test/files/run/t6935.scala b/test/files/run/t6935.scala new file mode 100644 index 0000000000..dea2d7f2e2 --- /dev/null +++ b/test/files/run/t6935.scala @@ -0,0 +1,14 @@ +object Test { + + def main(args: Array[String]): Unit = { + import java.io._ + val bytes = new ByteArrayOutputStream() + val out = new ObjectOutputStream(bytes) + out.writeObject(()) + out.close() + val buf = bytes.toByteArray + val in = new ObjectInputStream(new ByteArrayInputStream(buf)) + val unit = in.readObject() + assert(unit == ()) + } +} |