Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Prevent ConfigPusher from killing its thread
[controller.git]
/
opendaylight
/
containermanager
/
implementation
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
containermanager
/
internal
/
Activator.java
diff --git
a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java
b/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java
index a1fe0d1ee2a1936af798b88ff887b54b693b35cf..162cbf041a8757a9d6ed269783fc9932a15442d2 100644
(file)
--- a/
opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java
+++ b/
opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java
@@
-24,9
+24,11
@@
import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase;
import org.opendaylight.controller.sal.core.IContainer;
import org.opendaylight.controller.sal.core.IContainerAware;
import org.opendaylight.controller.sal.core.IContainerListener;
import org.opendaylight.controller.sal.core.IContainer;
import org.opendaylight.controller.sal.core.IContainerAware;
import org.opendaylight.controller.sal.core.IContainerListener;
+import org.opendaylight.controller.sal.core.IContainerLocalListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
public class Activator extends ComponentActivatorAbstractBase {
protected static final Logger logger = LoggerFactory.getLogger(Activator.class);
public class Activator extends ComponentActivatorAbstractBase {
protected static final Logger logger = LoggerFactory.getLogger(Activator.class);
@@
-140,6
+142,12
@@
public class Activator extends ComponentActivatorAbstractBase {
.setService(IContainerListener.class)
.setCallbacks("setIContainerListener", "unsetIContainerListener")
.setRequired(false));
.setService(IContainerListener.class)
.setCallbacks("setIContainerListener", "unsetIContainerListener")
.setRequired(false));
+
+ // Interface expected to be exported by the Functional Modules
+ c.add(createServiceDependency()
+ .setService(IContainerLocalListener.class)
+ .setCallbacks("setIContainerLocalListener", "unsetIContainerLocalListener")
+ .setRequired(false));
}
}
}
}
}
}