[skywalking] branch master updated: Fix NPE when ALS is off. (#2715)

[wusheng]

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

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new 7b21c33  Fix NPE when ALS is off. (#2715)
7b21c33 is described below

commit 7b21c337e020381a02293d1bf788e2cbca05d283
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Sun May 19 23:51:17 2019 +0800

    Fix NPE when ALS is off. (#2715)
---
 .../oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java
 
b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java
index b7ff4d8..108f965 100644
--- 
a/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java
+++ 
b/oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/EnvoyMetricReceiverConfig.java
@@ -18,18 +18,21 @@
 
 package org.apache.skywalking.oap.server.receiver.envoy;
 
+import com.google.common.base.Strings;
 import java.util.*;
 import java.util.stream.Collectors;
-
 import org.apache.skywalking.oap.server.library.module.ModuleConfig;
 
 /**
- * @author wusheng,gaohongtao
+ * @author wusheng, gaohongtao
  */
 public class EnvoyMetricReceiverConfig extends ModuleConfig {
     private String alsHTTPAnalysis;
 
     public List<String> getAlsHTTPAnalysis() {
+        if (Strings.isNullOrEmpty(alsHTTPAnalysis)) {
+            return Collections.EMPTY_LIST;
+        }
         return 
Arrays.stream(alsHTTPAnalysis.trim().split(",")).map(String::trim).collect(Collectors.toList());
     }
 }