X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcore%2Fapi%2FAbstractProvider.java;fp=opendaylight%2Fmd-sal%2Fsal-dom-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcore%2Fapi%2FAbstractProvider.java;h=b621e5f9896f2f3f9a6b004ba8af50ec73334291;hp=5cdc26d35e63eeb83e238c2e2c7fe13f6a9e4847;hb=e2607370f5ac443a5a2f1f00f693f82a0b57161d;hpb=ae89c0104ae8cca6e838112aa0ff048f1885f567

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 5cdc26d35e..b621e5f989 100644
--- 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;