use an empty map if the env is null

Netflix · Jun 30, 2015 · fd6628e · fd6628e
1 parent 271c63c
commit fd6628e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/spectator-ext-spark/src/main/java/com/netflix/spectator/spark/SidecarRegistry.java b/spectator-ext-spark/src/main/java/com/netflix/spectator/spark/SidecarRegistry.java
@@ -37,6 +37,7 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -57,7 +58,7 @@ public class SidecarRegistry extends AbstractRegistry {
     @Override public Map<String, String> call() throws Exception {
       SparkEnv env = SparkEnv$.MODULE$.get();
       if (env == null) {
-        return null;
+        return Collections.emptyMap();
       } else {
         Map<String, String> tagMap = new HashMap<>();
         SparkConf conf = env.conf();