X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyang%2Fmd%2Fsal%2Fbinding%2Fimpl%2FForwardedCompatibleDataBrokerImplModule.java;h=0ea30f7e66a817f63c63cc81e20f3890170ea7b5;hp=647ca85671a73bcca9f958bcc4b003e40d9e828a;hb=d206d27042eef2185c875f85cf6eac61a1bd77c4;hpb=f9a5557ea91bc6c877453583e17adf1606b58290 diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModule.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModule.java index 647ca85671..0ea30f7e66 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModule.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/ForwardedCompatibleDataBrokerImplModule.java @@ -19,7 +19,6 @@ import org.opendaylight.controller.sal.core.api.Broker.ProviderSession; import org.opendaylight.controller.sal.core.api.Provider; import org.opendaylight.controller.sal.core.api.model.SchemaService; import org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService; -import org.osgi.framework.BundleContext; import com.google.common.util.concurrent.ListeningExecutorService; @@ -30,8 +29,6 @@ public final class ForwardedCompatibleDataBrokerImplModule extends org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractForwardedCompatibleDataBrokerImplModule implements Provider { - private BundleContext bundleContext; - public ForwardedCompatibleDataBrokerImplModule( final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { @@ -57,26 +54,17 @@ public final class ForwardedCompatibleDataBrokerImplModule extends BindingIndependentMappingService mappingService = getBindingMappingServiceDependency(); Broker domBroker = getDomAsyncBrokerDependency(); - ProviderSession session = domBroker.registerProvider(this, getBundleContext()); + ProviderSession session = domBroker.registerProvider(this, null); DOMDataBroker domDataBroker = session.getService(DOMDataBroker.class); + SchemaService schemaService = session.getService(SchemaService.class); ForwardedBackwardsCompatibleDataBroker dataBroker = new ForwardedBackwardsCompatibleDataBroker(domDataBroker, - mappingService, listeningExecutor); - - session.getService(SchemaService.class).registerSchemaServiceListener(dataBroker); + mappingService, schemaService,listeningExecutor); dataBroker.setConnector(BindingDomConnectorDeployer.createConnector(getBindingMappingServiceDependency())); dataBroker.setDomProviderContext(session); return dataBroker; } - public BundleContext getBundleContext() { - return bundleContext; - } - - public void setBundleContext(final BundleContext bundleContext2) { - this.bundleContext = bundleContext2; - } - @Override public void onSessionInitiated(final ProviderSession session) {