Skip to content

Commit ecb78ee

Browse files
committed
Fix conflict between java.io.Serializable and use of Scala's Serializable
1 parent f4717f9 commit ecb78ee

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.apache.spark.api.java
1919

20-
import java.io.Serializable
2120
import java.util.{Comparator, List => JList, Iterator => JIterator}
2221
import java.lang.{Iterable => JIterable, Long => JLong}
2322

@@ -592,7 +591,7 @@ trait JavaRDDLike[T, This <: JavaRDDLike[T, This]] extends Serializable {
592591
new SerializableMapWrapper(underlying)
593592

594593
private[java] class SerializableMapWrapper[A, B](underlying: collection.Map[A, B])
595-
extends MapWrapper(underlying) with Serializable
594+
extends MapWrapper(underlying) with java.io.Serializable
596595

597596

598597
}

0 commit comments

Comments
 (0)