X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fdom%2Fbroker%2FBrokerImpl.java;h=68066778dbd29308dbb6093b6c59d98e62dce080;hp=c15582e95393ee00a81b5b0f9b8432f564fb395c;hb=2d82d2f4f36d22d24883a0f855e39289603377f8;hpb=3b144c5e66f5e4d14ec881fb553d118e53efd82a diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java index c15582e953..68066778db 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java @@ -62,22 +62,13 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { @Override public ConsumerSession registerConsumer(final Consumer consumer, final BundleContext ctx) { - checkPredicates(consumer); - log.trace("Registering consumer {}", consumer); - final ConsumerContextImpl session = newSessionFor(consumer, ctx); - consumer.onSessionInitiated(session); - sessions.add(session); - return session; + return registerConsumer(consumer); } @Override public ProviderSession registerProvider(final Provider provider, final BundleContext ctx) { - checkPredicates(provider); - final ProviderContextImpl session = newSessionFor(provider, ctx); - provider.onSessionInitiated(session); - providerSessions.add(session); - return session; + return registerProvider(provider); } protected Future> invokeRpcAsync(final QName rpc, @@ -106,14 +97,12 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { } // Private Factory methods - private ConsumerContextImpl newSessionFor(final Consumer provider, - final BundleContext ctx) { + private ConsumerContextImpl newSessionFor(final Consumer provider) { ConsumerContextImpl ret = new ConsumerContextImpl(provider, this); return ret; } - private ProviderContextImpl newSessionFor(final Provider provider, - final BundleContext ctx) { + private ProviderContextImpl newSessionFor(final Provider provider) { ProviderContextImpl ret = new ProviderContextImpl(provider, this); return ret; } @@ -210,14 +199,23 @@ public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { @Override - public ConsumerSession registerConsumer(Consumer cons) { - return registerConsumer(cons,null); + public ConsumerSession registerConsumer(Consumer consumer) { + checkPredicates(consumer); + log.trace("Registering consumer {}", consumer); + final ConsumerContextImpl session = newSessionFor(consumer); + consumer.onSessionInitiated(session); + sessions.add(session); + return session; } @Override - public ProviderSession registerProvider(Provider prov) { - return registerProvider(prov,null); + public ProviderSession registerProvider(Provider provider) { + checkPredicates(provider); + final ProviderContextImpl session = newSessionFor(provider); + provider.onSessionInitiated(session); + providerSessions.add(session); + return session; } }