diff options
author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-07-23 13:56:10 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-07-23 13:56:10 +0200 |
commit | 1a74e38366efe8b8fc1c189a591870603ef043a0 (patch) | |
tree | 1f153bea10f2da7d2993eebdb1cb9d08c3a6c811 /src | |
parent | 823fb0ffb256590305a44897acfa80bb99f6d19b (diff) | |
parent | 4ca63897c92b1456ee37d6a525f67d5939954b84 (diff) | |
download | scala-1a74e38366efe8b8fc1c189a591870603ef043a0.tar.gz scala-1a74e38366efe8b8fc1c189a591870603ef043a0.tar.bz2 scala-1a74e38366efe8b8fc1c189a591870603ef043a0.zip |
Merge pull request #4647 from Ichoran/issue/8911
SI-8911 allow serializing Scala Maps wrapped as Java ones
Diffstat (limited to 'src')
-rw-r--r-- | src/library/scala/collection/convert/Wrappers.scala | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/library/scala/collection/convert/Wrappers.scala b/src/library/scala/collection/convert/Wrappers.scala index 9f9732c62f..c2da66a9bf 100644 --- a/src/library/scala/collection/convert/Wrappers.scala +++ b/src/library/scala/collection/convert/Wrappers.scala @@ -102,9 +102,9 @@ private[collection] trait Wrappers { override def clone(): JListWrapper[A] = JListWrapper(new ju.ArrayList[A](underlying)) } - // Note various overrides to avoid performance gotchas. - class SetWrapper[A](underlying: Set[A]) extends ju.AbstractSet[A] { - self => + @SerialVersionUID(1L) + class SetWrapper[A](underlying: Set[A]) extends ju.AbstractSet[A] with Serializable { self => + // Note various overrides to avoid performance gotchas. override def contains(o: Object): Boolean = { try { underlying.contains(o.asInstanceOf[A]) } catch { case cce: ClassCastException => false } @@ -165,7 +165,8 @@ private[collection] trait Wrappers { new JSetWrapper[A](new ju.LinkedHashSet[A](underlying)) } - class MapWrapper[A, B](underlying: Map[A, B]) extends ju.AbstractMap[A, B] { self => + @SerialVersionUID(1L) + class MapWrapper[A, B](underlying: Map[A, B]) extends ju.AbstractMap[A, B] with Serializable { self => override def size = underlying.size override def get(key: AnyRef): B = try { |