From 222b0d98368b8983c5423afd221b48a3d9c06f03 Mon Sep 17 00:00:00 2001
From: Peter <c2zwdjnlcg@users.noreply.github.com>
Date: Thu, 17 Aug 2023 09:55:25 -0700
Subject: [PATCH] rsc: Don't set spark configuration values to an empty string

It's better to leave out a key rather than set the value to an
empty string
---
 rsc/src/main/java/org/apache/livy/rsc/ContextLauncher.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rsc/src/main/java/org/apache/livy/rsc/ContextLauncher.java b/rsc/src/main/java/org/apache/livy/rsc/ContextLauncher.java
index c59136d55..3b059bb3b 100644
--- a/rsc/src/main/java/org/apache/livy/rsc/ContextLauncher.java
+++ b/rsc/src/main/java/org/apache/livy/rsc/ContextLauncher.java
@@ -254,7 +254,9 @@ public void run() {
 
   private static void merge(RSCConf conf, String key, String livyConf, String sep) {
     String confValue = Utils.join(Arrays.asList(livyConf, conf.get(key)), sep);
-    conf.set(key, confValue);
+    if (confValue != null && !confValue.isEmpty()) {
+      conf.set(key, confValue);
+    }
   }
 
   /**