Fixed FELIX-3164
The description object was not created in the right method for the EventAdminSubscriberHandler.
I've also fixed the broken Javadoc references (@see)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1187265 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventAdminPublisherHandler.java b/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventAdminPublisherHandler.java
index d89f6f1..1629726 100644
--- a/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventAdminPublisherHandler.java
+++ b/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/publisher/EventAdminPublisherHandler.java
@@ -80,15 +80,15 @@
/**
* Initializes the component type.
*
- * @param cd the component type description to populate
+ * @param cd the component type description to populate
* @param metadata the component type metadata
* @throws ConfigurationException if the given metadata is incorrect.
- * @see org.apache.felix.ipojo.Handler#initializeComponentFactory(org.apache.felix.ipojo.architecture.ComponentDescription,
- * org.apache.felix.ipojo.metadata.Element)
+ * @see org.apache.felix.ipojo.Handler#initializeComponentFactory(
+ * org.apache.felix.ipojo.architecture.ComponentTypeDescription, org.apache.felix.ipojo.metadata.Element)
*/
public void initializeComponentFactory(ComponentTypeDescription cd,
- Element metadata)
- throws ConfigurationException {
+ Element metadata)
+ throws ConfigurationException {
// Update the current component description
Dictionary dict = new Properties();
@@ -100,7 +100,7 @@
Element[] publishers = metadata.getElements("publisher", NAMESPACE);
// if publisher is null, look for 'publishes' elements
- if (publishers == null || publishers.length == 0) {
+ if (publishers == null || publishers.length == 0) {
publishers = metadata.getElements("publishes", NAMESPACE);
}
@@ -154,8 +154,7 @@
* @param metadata the component type metadata
* @param conf the instance configuration
* @throws ConfigurationException if one event publication is not correct
- * @see org.apache.felix.ipojo.Handler#configure(org.apache.felix.ipojo.InstanceManager,
- * org.apache.felix.ipojo.metadata.Element, java.util.Dictionary)
+ * @see org.apache.felix.ipojo.Handler#configure(org.apache.felix.ipojo.metadata.Element, java.util.Dictionary)
*/
public void configure(Element metadata, Dictionary conf)
throws ConfigurationException {
diff --git a/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberHandler.java b/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberHandler.java
index 86748b4..8120c55 100644
--- a/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberHandler.java
+++ b/ipojo/handler/eventadmin/src/main/java/org/apache/felix/ipojo/handlers/event/subscriber/EventAdminSubscriberHandler.java
@@ -112,8 +112,8 @@
* @param cd component type description to populate.
* @param metadata component type metadata.
* @throws ConfigurationException if the metadata are incorrect.
- * @see org.apache.felix.ipojo.Handler#initializeComponentFactory(org.apache.felix.ipojo.architecture.ComponentDescription,
- * org.apache.felix.ipojo.metadata.Element)
+ * @see org.apache.felix.ipojo.Handler#initializeComponentFactory(
+ * org.apache.felix.ipojo.architecture.ComponentTypeDescription, org.apache.felix.ipojo.metadata.Element)
*/
public void initializeComponentFactory(ComponentTypeDescription cd,
Element metadata)
@@ -197,8 +197,7 @@
* @param metadata the omponent type metadata
* @param conf the instance configuration
* @throws ConfigurationException if one event subscription is not correct
- * @see org.apache.felix.ipojo.Handler#configure(org.apache.felix.ipojo.InstanceManager,
- * org.apache.felix.ipojo.metadata.Element, java.util.Dictionary)
+ * @see org.apache.felix.ipojo.Handler#configure(org.apache.felix.ipojo.metadata.Element, java.util.Dictionary)
*/
public void configure(Element metadata, Dictionary conf)
throws ConfigurationException {
@@ -276,6 +275,9 @@
m_topics[i++] = tmp;
}
+ m_description = new EventAdminSubscriberHandlerDescription(this,
+ subscribers);
+
} else {
info(LOG_PREFIX + "No subscriber to configure");
}