Skip to content

Commit

Permalink
Fix conflict between java.io.Serializable and use of Scala's Serializ…
Browse files Browse the repository at this point in the history
…able
  • Loading branch information
srowen committed Oct 15, 2014
1 parent f4717f9 commit ecb78ee
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.spark.api.java

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

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

private[java] class SerializableMapWrapper[A, B](underlying: collection.Map[A, B])
extends MapWrapper(underlying) with Serializable
extends MapWrapper(underlying) with java.io.Serializable


}

0 comments on commit ecb78ee

Please sign in to comment.