You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/02/10 12:37:45 UTC
[karaf-decanter] branch master updated: [KARAF-6146] Fix potential
NPE in alerter
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git
The following commit(s) were added to refs/heads/master by this push:
new 773ad74 [KARAF-6146] Fix potential NPE in alerter
new 35f2332 Merge pull request #71 from jbonofre/KARAF-6146
773ad74 is described below
commit 773ad74f5fd84d27566a06d214204040883d3a99
Author: Jean-Baptiste Onofré <jb...@nanthrax.net>
AuthorDate: Sun Feb 10 09:14:34 2019 +0100
[KARAF-6146] Fix potential NPE in alerter
---
.../src/main/java/org/apache/karaf/decanter/alerting/log/Logger.java | 3 ++-
.../org/apache/karaf/decanter/collector/eventadmin/EventCollector.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/alerting/alerter/log/src/main/java/org/apache/karaf/decanter/alerting/log/Logger.java b/alerting/alerter/log/src/main/java/org/apache/karaf/decanter/alerting/log/Logger.java
index bcf5deb..151069c 100644
--- a/alerting/alerter/log/src/main/java/org/apache/karaf/decanter/alerting/log/Logger.java
+++ b/alerting/alerter/log/src/main/java/org/apache/karaf/decanter/alerting/log/Logger.java
@@ -35,7 +35,8 @@ public class Logger implements EventHandler {
public void handleEvent(Event event) {
StringBuilder builder = new StringBuilder();
for (String innerKey : event.getPropertyNames()) {
- builder.append(innerKey).append(":").append(event.getProperty(innerKey).toString()).append(" | ");
+ String value = (event.getProperty(innerKey) != null) ? event.getProperty(innerKey).toString() : null;
+ builder.append(innerKey).append(":").append(value).append(" | ");
}
boolean backToNormal = (boolean) event.getProperty("alertBackToNormal");
if (event.getProperty("alertLevel") != null && ((String) event.getProperty("alertLevel")).equalsIgnoreCase("error")) {
diff --git a/collector/eventadmin/src/main/java/org/apache/karaf/decanter/collector/eventadmin/EventCollector.java b/collector/eventadmin/src/main/java/org/apache/karaf/decanter/collector/eventadmin/EventCollector.java
index f23e651..44d79b0 100644
--- a/collector/eventadmin/src/main/java/org/apache/karaf/decanter/collector/eventadmin/EventCollector.java
+++ b/collector/eventadmin/src/main/java/org/apache/karaf/decanter/collector/eventadmin/EventCollector.java
@@ -54,7 +54,7 @@ public class EventCollector implements EventHandler {
for (String property : event.getPropertyNames()) {
if (property.equals("type")) {
if (event.getProperty(property) != null) {
- data.put("eventType", event.getProperty(property).toString());
+ data.put("eventType", (event.getProperty(property) != null) ? event.getProperty(property).toString() : null);
} else {
data.put("eventType", "eventadmin");
}