From 7b21c337e020381a02293d1bf788e2cbca05d283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Sun, 19 May 2019 23:51:17 +0800 Subject: [PATCH] Fix NPE when ALS is off. (#2715) --- .../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 b7ff4d8d6..108f96555 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 getAlsHTTPAnalysis() { + if (Strings.isNullOrEmpty(alsHTTPAnalysis)) { + return Collections.EMPTY_LIST; + } return Arrays.stream(alsHTTPAnalysis.trim().split(",")).map(String::trim).collect(Collectors.toList()); } }