Use Option.

dongjoon-hyun · dongjoon-hyun · commit 528b0fd1bd8a · 2017-01-22T16:33:17.000-08:00
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/command/SetCommand.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/command/SetCommand.scala
@@ -89,7 +89,7 @@ case class SetCommand(kv: Option[(String, Option[String])]) extends RunnableComm
       val runFunc = (sparkSession: SparkSession) => {
         sparkSession.sessionState.conf.getAllDefinedConfs.sorted.map {
           case (key, defaultValue, doc) =>
-            Row(key, if (defaultValue == null) "<undefined>" else defaultValue, doc)
+            Row(key, Option(defaultValue).getOrElse("<undefined>"), doc)
         }
       }
       val schema = StructType(

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ case class SetCommand(kv: Option[(String, Option[String])]) extends RunnableComm`
`89`	`89`	`val runFunc = (sparkSession: SparkSession) => {`
`90`	`90`	`sparkSession.sessionState.conf.getAllDefinedConfs.sorted.map {`
`91`	`91`	`case (key, defaultValue, doc) =>`
`92`		`- Row(key, if (defaultValue == null) "<undefined>" else defaultValue, doc)`
	`92`	`+ Row(key, Option(defaultValue).getOrElse("<undefined>"), doc)`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`val schema = StructType(`