Elan Junit Testcases

[netvirt.git] / vpnservice / elanmanager / elanmanager-impl / src / main / java / org / opendaylight / netvirt / elan / utils / ElanUtils.java

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
index 8558d251cc9711f9575f4ace47db34ea85f6eb67..ad0ce127bae043cbeda3ce632d70504907c5f9c2 100755 (executable)
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java
@@ -233,7 +233,8 @@ public class ElanUtils {
     }
 
     public final Boolean isOpenStackVniSemanticsEnforced() {
-        return elanConfig.isOpenstackVniSemanticsEnforced();
+        return elanConfig.isOpenstackVniSemanticsEnforced() != null
+                ? elanConfig.isOpenstackVniSemanticsEnforced() : false;
     }
 
     public static void addElanInstanceIntoCache(String elanInstanceName, ElanInstance elanInstance) {