Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix findbugs violations in md-sal - part 1
[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 6465e1deb20e248fd090b9f5dfcd8f81945ae81f..46e9cdcd718917c4f26f33647eb1bf197a477d3f 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
@@
-29,13
+29,14
@@
public abstract class AbstractConsumer implements Consumer, BundleActivator,Serv
tracker.open();
}
tracker.open();
}
-
-
@Override
public final void stop(final BundleContext bundleContext) throws Exception {
stopImpl(bundleContext);
broker = null;
@Override
public final void stop(final BundleContext bundleContext) throws Exception {
stopImpl(bundleContext);
broker = null;
- tracker.close();
+
+ if (tracker != null) {
+ tracker.close();
+ }
}
protected void startImpl(final BundleContext bundleContext) {
}
protected void startImpl(final BundleContext bundleContext) {
@@
-54,7
+55,7
@@
public abstract class AbstractConsumer implements Consumer, BundleActivator,Serv
@Override
public Broker addingService(final ServiceReference<Broker> reference) {
@Override
public Broker addingService(final ServiceReference<Broker> reference) {
- if (broker == null) {
+ if (broker == null
&& context != null
) {
broker = context.getService(reference);
broker.registerConsumer(this, context);
return broker;
broker = context.getService(reference);
broker.registerConsumer(this, context);
return broker;