Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-614: introduce AbstractRuntimeCodeGenerator"
[controller.git]
/
opendaylight
/
md-sal
/
sal-dom-api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
core
/
api
/
AbstractConsumer.java
diff --git
a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java
b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java
index 99a38ca43a5be68fd3c9bad328e20ab98d0578a4..c14d5a679cf8c2f8bcb2172f520273fac160ea50 100644
(file)
--- a/
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java
+++ b/
opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java
@@
-18,9
+18,9
@@
import org.osgi.util.tracker.ServiceTrackerCustomizer;
public abstract class AbstractConsumer implements Consumer, BundleActivator,ServiceTrackerCustomizer<Broker, Broker> {
public abstract class AbstractConsumer implements Consumer, BundleActivator,ServiceTrackerCustomizer<Broker, Broker> {
-
-
-
+
+
+
private BundleContext context;
private ServiceTracker<Broker, Broker> tracker;
private Broker broker;
private BundleContext context;
private ServiceTracker<Broker, Broker> tracker;
private Broker broker;
@@
-54,7
+54,7
@@
public abstract class AbstractConsumer implements Consumer, BundleActivator,Serv
return Collections.emptySet();
}
return Collections.emptySet();
}
-
+
@Override
public Broker addingService(ServiceReference<Broker> reference) {
if(broker == null) {
@Override
public Broker addingService(ServiceReference<Broker> reference) {
if(broker == null) {
@@
-62,15
+62,15
@@
public abstract class AbstractConsumer implements Consumer, BundleActivator,Serv
broker.registerConsumer(this, context);
return broker;
}
broker.registerConsumer(this, context);
return broker;
}
-
+
return null;
}
return null;
}
-
+
@Override
public void modifiedService(ServiceReference<Broker> reference, Broker service) {
// NOOP
}
@Override
public void modifiedService(ServiceReference<Broker> reference, Broker service) {
// NOOP
}
-
+
@Override
public void removedService(ServiceReference<Broker> reference, Broker service) {
stopImpl(context);
@Override
public void removedService(ServiceReference<Broker> reference, Broker service) {
stopImpl(context);