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 2016/03/23 17:14:12 UTC
karaf-decanter git commit: KARAF-4440 - Cast the type event property
as a String
Repository: karaf-decanter
Updated Branches:
refs/heads/master e5ab9d0c8 -> 128d66595
KARAF-4440 - Cast the type event property as a String
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/128d6659
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/128d6659
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/128d6659
Branch: refs/heads/master
Commit: 128d665952a6a0ee6b4bb23be04fba600a77186f
Parents: e5ab9d0
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Mar 23 17:13:19 2016 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Mar 23 17:13:19 2016 +0100
----------------------------------------------------------------------
.../decanter/collector/eventadmin/EventCollector.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/128d6659/collector/eventadmin/src/main/java/org/apache/karaf/decanter/collector/eventadmin/EventCollector.java
----------------------------------------------------------------------
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 29a6116..09a7bc9 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
@@ -20,6 +20,7 @@ import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
+import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
import java.util.HashMap;
@@ -38,7 +39,15 @@ public class EventCollector implements EventHandler {
String topic = event.getTopic();
Map<String, Object> data = new HashMap<>();
for (String property : event.getPropertyNames()) {
- data.put(property, event.getProperty(property));
+ if (property.equals("type")) {
+ if (event.getProperty(property) != null) {
+ data.put(property, event.getProperty(property).toString());
+ } else {
+ data.put(property, "eventadmin");
+ }
+ } else {
+ data.put(property, event.getProperty(property));
+ }
}
Event bridge = new Event("decanter/collect/eventadmin/" + topic, data);
eventAdmin.sendEvent(bridge);