Init data-broker before topo-provider registration to prevent NPE

java.lang.NullPointerException: null
        at org.opendaylight.bgpcep.bgp.topology.provider.AbstractTopologyBuilder.initTransactionChain(AbstractTopologyBuilder.java:292)
        at org.opendaylight.bgpcep.bgp.topology.provider.AbstractTopologyBuilder.start(AbstractTopologyBuilder.java:107)
        at org.opendaylight.bgpcep.bgp.topology.provider.config.TopologyReferenceSingletonServiceImpl.instantiateServiceInstance(TopologyReferenceSingletonServiceImpl.java:51)
        . . .

JIRA: BGPCEP-870
Change-Id: Iaec5a537cb5125e1355f197222d9265673d779a9
Signed-off-by: Ajay Lele <ajayslele@gmail.com>

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/AbstractBgpTopologyProvider.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/AbstractBgpTopologyProvider.java
index b78cf99f020ebfe02d84e5474affe4d8e5050dbc..27f4ffe2ef857cc88bd73c318375e162bc98fa29 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/AbstractBgpTopologyProvider.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/AbstractBgpTopologyProvider.java
@@ -41,8 +41,8 @@ abstract class AbstractBgpTopologyProvider implements BgpTopologyProvider, AutoC
 
     AbstractBgpTopologyProvider(final BgpTopologyDeployer deployer) {
         this.deployer = deployer;
-        this.registration = deployer.registerTopologyProvider(this);
         this.dataBroker = deployer.getDataBroker();
+        this.registration = deployer.registerTopologyProvider(this);
     }
 
     @Override