keep deserializer outermost null check

kings129 · kings129 · commit 2372d49b025d · 2023-04-19T03:03:13.000-07:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/encoders/ExpressionEncoder.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/encoders/ExpressionEncoder.scala
@@ -123,7 +123,7 @@ object ExpressionEncoder {
 
     new ExpressionEncoder[Any](
       nullSafe(newSerializerInput, newSerializer),
-      newDeserializer,
+      nullSafe(newDeserializerInput, newDeserializer),
       ClassTag(cls))
   }
 

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ object ExpressionEncoder {`
`123`	`123`
`124`	`124`	`new ExpressionEncoder[Any](`
`125`	`125`	`nullSafe(newSerializerInput, newSerializer),`
`126`		`- newDeserializer,`
	`126`	`+ nullSafe(newDeserializerInput, newDeserializer),`
`127`	`127`	`ClassTag(cls))`
`128`	`128`	`}`
`129`	`129`