diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-07-05 17:19:51 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-07-05 17:19:51 +0200 |
| commit | 16702363dbf3a305b9a7f04c04df18f58f2a3b15 (patch) | |
| tree | 8382285eecbab8cef4a560908c37baa0d12a81b8 | |
| parent | bc2e6fe8bf20b2aa985ea78a2c610ac33497da38 (diff) | |
| download | scala-16702363dbf3a305b9a7f04c04df18f58f2a3b15.tar.gz scala-16702363dbf3a305b9a7f04c04df18f58f2a3b15.tar.bz2 scala-16702363dbf3a305b9a7f04c04df18f58f2a3b15.zip | |
SI-5974 make collection.convert.Wrappers serializable
| -rw-r--r-- | src/library/scala/collection/convert/Wrappers.scala | 3 | ||||
| -rw-r--r-- | test/files/run/t5974.check | 1 | ||||
| -rw-r--r-- | test/files/run/t5974.scala | 10 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/library/scala/collection/convert/Wrappers.scala b/src/library/scala/collection/convert/Wrappers.scala index 8c603dc91b..75707b69b0 100644 --- a/src/library/scala/collection/convert/Wrappers.scala +++ b/src/library/scala/collection/convert/Wrappers.scala @@ -467,4 +467,5 @@ private[collection] trait Wrappers { } } -object Wrappers extends Wrappers +@SerialVersionUID(0 - 5857859809262781311L) +object Wrappers extends Wrappers with Serializable diff --git a/test/files/run/t5974.check b/test/files/run/t5974.check new file mode 100644 index 0000000000..9766475a41 --- /dev/null +++ b/test/files/run/t5974.check @@ -0,0 +1 @@ +ok diff --git a/test/files/run/t5974.scala b/test/files/run/t5974.scala new file mode 100644 index 0000000000..5b99e9f721 --- /dev/null +++ b/test/files/run/t5974.scala @@ -0,0 +1,10 @@ +object Test extends App { + import scala.collection.JavaConverters._ + + def ser(a: AnyRef) = + (new java.io.ObjectOutputStream(new java.io.ByteArrayOutputStream())).writeObject(a) + + val l = java.util.Arrays.asList("pigdog").asScala + ser(l) + println("ok") +} |