[incubator-livy] branch master updated: [LIVY-986][SERVER] Adding null pointer check for SessionInfo (#412)

[ggal]

This is an automated email from the ASF dual-hosted git repository.

ggal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-livy.git


The following commit(s) were added to refs/heads/master by this push:
     new 4cee47df [LIVY-986][SERVER] Adding null pointer check for SessionInfo 
(#412)
4cee47df is described below

commit 4cee47df13348b6a3daedc5215d0cec0f98c83ee
Author: Asif Khatri <123077165+askha...@users.noreply.github.com>
AuthorDate: Fri Aug 18 17:23:06 2023 +0530

    [LIVY-986][SERVER] Adding null pointer check for SessionInfo (#412)
    
    We need to add a null check for SessionInfo in 
InteractiveSessionServlet.scala to avoid an exception that might occur during a 
Livy upgrade.
---
 .../interactive/InteractiveSessionServlet.scala    | 26 +++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git 
a/server/src/main/scala/org/apache/livy/server/interactive/InteractiveSessionServlet.scala
 
b/server/src/main/scala/org/apache/livy/server/interactive/InteractiveSessionServlet.scala
index 239936f3..a30f2a41 100644
--- 
a/server/src/main/scala/org/apache/livy/server/interactive/InteractiveSessionServlet.scala
+++ 
b/server/src/main/scala/org/apache/livy/server/interactive/InteractiveSessionServlet.scala
@@ -92,14 +92,34 @@ class InteractiveSessionServlet(
         Nil
       }
 
+    val conf = if (session.conf != null) {
+      session.conf.asJava
+    } else null
+
+    val archives = if (session.archives != null) {
+      session.archives.asJava
+    } else null
+
+    val jars = if (session.jars != null) {
+      session.jars.asJava
+    } else null
+
+    val pyFiles = if (session.pyFiles != null) {
+      session.pyFiles.asJava
+    } else null
+
+    val files = if (session.files != null) {
+      session.files.asJava
+    } else null
+
     new SessionInfo(session.id, session.name.orNull, session.appId.orNull,
       session.owner, session.state.toString, session.kind.toString,
       session.appInfo.asJavaMap, logs.asJava,
       session.proxyUser.orNull, session.driverMemory.orNull,
       session.driverCores.getOrElse(0), session.executorMemory.orNull,
-      session.executorCores.getOrElse(0), session.conf.asJava, 
session.archives.asJava,
-      session.files.asJava, session.heartbeatTimeoutS, session.jars.asJava,
-      session.numExecutors.getOrElse(0), session.proxyUser.orNull, 
session.pyFiles.asJava,
+      session.executorCores.getOrElse(0), conf, archives,
+      files, session.heartbeatTimeoutS, jars,
+      session.numExecutors.getOrElse(0), session.proxyUser.orNull, pyFiles,
       session.queue.orNull)
   }