Merge "JUnit test case for ITM"

[genius.git] / interfacemanager / interfacemanager-impl / src / main / java / org / opendaylight / genius / interfacemanager / commons / InterfaceMetaUtils.java

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceMetaUtils.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceMetaUtils.java
index 8749b75de02d56e7f583cf4d73dd118fce0e0d40..7cbe678ad4031617e6d7da3df76a52683889bf73 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceMetaUtils.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceMetaUtils.java
@@ -77,6 +77,9 @@ public class InterfaceMetaUtils {
             // bridge ref entry will be null if the bridge is disconnected from controller.
             // In that case, fetch bridge reference from bridge interface entry config DS
             BridgeEntry bridgeEntry = getBridgeEntryFromConfigDS(dpId, dataBroker);
+            if(bridgeEntry == null){
+                return null;
+            }
             return  bridgeEntry.getBridgeReference();
         }
         return bridgeRefEntry.getBridgeReference();