commit 91d2410710aa59f057a0c076cf175138052f4b1c
author Amichai Rothman <amichai2@amichais.net> Wed May 15 12:01:24 2019 +0300
committer Amichai Rothman <amichai2@amichais.net> Thu May 16 12:44:52 2019 +0300
tree bd54762f44e5c13dc8cafbec56ee355850b2a453
parent e5942644a3cc5d025ddc652a9de2983a74b457f6

ARIES-1913 - Fix event properties

rsa/src/main/java/org/apache/aries/rsa/core/event/EventAdminSender.java

diff --git a/rsa/src/main/java/org/apache/aries/rsa/core/event/EventAdminSender.java b/rsa/src/main/java/org/apache/aries/rsa/core/event/EventAdminSender.java
index d36ae45..22974ba 100644
--- a/rsa/src/main/java/org/apache/aries/rsa/core/event/EventAdminSender.java
+++ b/rsa/src/main/java/org/apache/aries/rsa/core/event/EventAdminSender.java
@@ -23,11 +23,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;
 import org.osgi.service.remoteserviceadmin.EndpointDescription;
+import org.osgi.service.remoteserviceadmin.ImportReference;
 import org.osgi.service.remoteserviceadmin.RemoteServiceAdminEvent;
 
 public class EventAdminSender {
@@ -67,15 +69,17 @@
     private Event toEvent(RemoteServiceAdminEvent rsaEvent) {
         String topic = getTopic(rsaEvent);
         Map<String, Object> props = new HashMap<>();
-        props.put("bundle", rsaEvent.getSource());
-        props.put("bundle.id", rsaEvent.getSource().getBundleId());
-        props.put("bundle.symbolicname", rsaEvent.getSource().getSymbolicName());
-        props.put("bundle.version", rsaEvent.getSource().getVersion());
+        Bundle bundle = rsaEvent.getSource();
+        props.put("bundle", bundle);
+        props.put("bundle.id", bundle.getBundleId());
+        props.put("bundle.symbolicname", bundle.getSymbolicName());
+        props.put("bundle.version", bundle.getVersion());
         props.put("bundle.signer", ""); // TODO What to put here
-        if (rsaEvent.getException() != null) {
-            props.put("exception", rsaEvent.getException());
-            props.put("exception.class", rsaEvent.getException().getClass());
-            props.put("exception.class", rsaEvent.getException().getMessage());
+        Throwable exception = rsaEvent.getException();
+        if (exception != null) {
+            props.put("exception", exception);
+            props.put("exception.class", exception.getClass().getName());
+            props.put("exception.message", exception.getMessage());
         }
         if (rsaEvent.getExportReference() != null) {
             EndpointDescription endpoint = rsaEvent.getExportReference().getExportedEndpoint();
@@ -83,8 +87,9 @@
             props.put("endpoint.id", endpoint.getId());
             props.put("objectClass", endpoint.getInterfaces());
         }
-        if (rsaEvent.getImportReference() != null && rsaEvent.getImportReference().getImportedEndpoint() != null) {
-            props.put("service.imported.configs", rsaEvent.getImportReference().getImportedEndpoint().getConfigurationTypes());
+        ImportReference importReference = rsaEvent.getImportReference();
+        if (importReference != null && importReference.getImportedEndpoint() != null) {
+            props.put("service.imported.configs", importReference.getImportedEndpoint().getConfigurationTypes());
         }
         props.put("timestamp", System.currentTimeMillis());
         props.put("event", rsaEvent);