From: Robert Varga <rovarga@cisco.com>
Date: Wed, 16 Apr 2014 09:20:38 +0000 (+0200)
Subject: BUG-731: remove unneeded null check
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~211^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=2ab8e159e84a4444fa6fcf89d51c913c8b5a4bec

BUG-731: remove unneeded null check

Fixes a sonar warning:
https://sonar.opendaylight.org/issue/show/0b9faac8-cbfc-4aed-8749-80fdd53410d5

Change-Id: Ib44157dde70d9c654f6dcb242e1d44619a685ea6
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java
index 93849c2e91..a398abc75a 100644
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java
@@ -325,7 +325,7 @@ public class BindingIndependentConnector implements //
     }
 
     public void startRpcForwarding() {
-        if (baRpcRegistry != null && biRpcRegistry != null && baRpcRegistry instanceof RouteChangePublisher<?, ?>) {
+        if (biRpcRegistry != null && baRpcRegistry instanceof RouteChangePublisher<?, ?>) {
             checkState(!rpcForwarding, "Connector is already forwarding RPCs");
             domToBindingRpcManager = baRpcRegistry.registerRouteChangeListener(new DomToBindingRpcForwardingManager());
             if (baRpcRegistry instanceof RpcProviderRegistryImpl) {