rsc: Don't set spark configuration values to an empty string

c2zwdjnlcg · c2zwdjnlcg · commit 222b0d98368b · 2023-08-22T16:36:23.000-07:00
It's better to leave out a key rather than set the value to an
empty string
diff --git 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);
+    }
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,9 @@ public void run() {`
`254`	`254`
`255`	`255`	`private static void merge(RSCConf conf, String key, String livyConf, String sep) {`
`256`	`256`	`String confValue = Utils.join(Arrays.asList(livyConf, conf.get(key)), sep);`
`257`		`- conf.set(key, confValue);`
	`257`	`+ if (confValue != null && !confValue.isEmpty()) {`
	`258`	`+ conf.set(key, confValue);`
	`259`	`+ }`
`258`	`260`	`}`
`259`	`261`
`260`	`262`	`/**`