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 / AbstractProvider.java

diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java
index 5cdc26d35e63eeb83e238c2e2c7fe13f6a9e4847..b621e5f9896f2f3f9a6b004ba8af50ec73334291 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java
@@ -45,14 +45,18 @@ public abstract class AbstractProvider implements BundleActivator, Provider,Serv
     @Override
     public final void stop(final BundleContext bundleContext) throws Exception {
         broker = null;
-        tracker.close();
+
+        if (tracker != null) {
+            tracker.close();
+        }
+
         tracker = null;
         stopImpl(bundleContext);
     }
 
     @Override
     public Broker addingService(final ServiceReference<Broker> reference) {
-        if (broker == null) {
+        if (broker == null && context != null) {
             broker = context.getService(reference);
             broker.registerProvider(this, context);
             return broker;