Remove explicit conversion to avoid NPE

apache · Sep 8, 2014 · 59065bc · 59065bc
1 parent 26bc765
commit 59065bc
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
@@ -460,7 +460,6 @@ class SQLContext(@transient val sparkContext: SparkContext)
       rdd: RDD[Array[Any]],
       schema: StructType): SchemaRDD = {
     import scala.collection.JavaConversions._
-    import scala.collection.convert.Wrappers.{JListWrapper, JMapWrapper}
 
     def needsConversion(dataType: DataType): Boolean = dataType match {
       case ByteType => true
@@ -482,8 +481,7 @@ class SQLContext(@transient val sparkContext: SparkContext)
       case (null, _) => null
 
       case (c: java.util.List[_], ArrayType(elementType, _)) =>
-        val converted = c.map { e => convert(e, elementType)}
-        JListWrapper(converted)
+        c.map { e => convert(e, elementType)}: Seq[Any]
 
       case (c, ArrayType(elementType, _)) if c.getClass.isArray =>
         c.asInstanceOf[Array[_]].map(e => convert(e, elementType)): Seq[Any]