Skip to content

Commit f92cde2

Browse files
committed
[SPARK-3447][SQL] Remove explicit conversion with JListWrapper to avoid NPE
Author: Michael Armbrust <michael@databricks.com> Closes #2323 from marmbrus/kryoJListNPE and squashes the following commits: 9634f11 [Michael Armbrust] Rollback JSON RDD changes 4d4d93c [Michael Armbrust] Merge remote-tracking branch 'origin/master' into kryoJListNPE 646976b [Michael Armbrust] Fix JSON RDD Conversion too 59065bc [Michael Armbrust] Remove explicit conversion to avoid NPE
1 parent 84e2c8b commit f92cde2

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,6 @@ class SQLContext(@transient val sparkContext: SparkContext)
460460
rdd: RDD[Array[Any]],
461461
schema: StructType): SchemaRDD = {
462462
import scala.collection.JavaConversions._
463-
import scala.collection.convert.Wrappers.{JListWrapper, JMapWrapper}
464463

465464
def needsConversion(dataType: DataType): Boolean = dataType match {
466465
case ByteType => true
@@ -482,8 +481,7 @@ class SQLContext(@transient val sparkContext: SparkContext)
482481
case (null, _) => null
483482

484483
case (c: java.util.List[_], ArrayType(elementType, _)) =>
485-
val converted = c.map { e => convert(e, elementType)}
486-
JListWrapper(converted)
484+
c.map { e => convert(e, elementType)}: Seq[Any]
487485

488486
case (c, ArrayType(elementType, _)) if c.getClass.isArray =>
489487
c.asInstanceOf[Array[_]].map(e => convert(e, elementType)): Seq[Any]

0 commit comments

Comments
 (0)