You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by pe...@apache.org on 2018/08/19 02:50:10 UTC
[incubator-skywalking] branch master updated: Fix NPE in alarm
content generation. (#1558)
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new a29a8d7 Fix NPE in alarm content generation. (#1558)
a29a8d7 is described below
commit a29a8d7c09641b7c4e722d03c9816d15d68855c4
Author: caoyixiong <32...@users.noreply.github.com>
AuthorDate: Sun Aug 19 10:50:06 2018 +0800
Fix NPE in alarm content generation. (#1558)
* Update InstanceReferenceMetricAlarmAssertWorker.java
增加osInfo 判空
* Update InstanceReferenceMetricAlarmAssertWorker.java
增加osinfo 判空
---
.../worker/instance/InstanceReferenceMetricAlarmAssertWorker.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceReferenceMetricAlarmAssertWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceReferenceMetricAlarmAssertWorker.java
index 997c93e..9f5ffc3 100644
--- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceReferenceMetricAlarmAssertWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceReferenceMetricAlarmAssertWorker.java
@@ -68,7 +68,7 @@ public class InstanceReferenceMetricAlarmAssertWorker extends AlarmAssertWorker<
Instance instance = instanceDAO.getInstance(alarm.getBehindInstanceId());
JsonObject osInfo = gson.fromJson(instance.getOsInfo(), JsonObject.class);
String serverName = Const.UNKNOWN;
- if (osInfo.has("hostName")) {
+ if (osInfo != null && osInfo.has("hostName")) {
serverName = osInfo.get("hostName").getAsString();
}