From e47dc20e543e2f96ae793a97e2ce65035b23b525 Mon Sep 17 00:00:00 2001 From: Faseela K Date: Tue, 9 Feb 2016 19:27:46 +0530 Subject: [PATCH] Bug 5179 : Fixing NPE in InterfaceManager Change-Id: I43a9792a1fa5066ad8116376c9b36a2be7854d57 Signed-off-by: Faseela K (cherry picked from commit 6ea2beb7a1074c1cae20fac216bd14e2b3048cc2) --- .../java/org/opendaylight/vpnservice/interfacemgr/IfmUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/IfmUtil.java b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/IfmUtil.java index 531f25b1..76f78b2a 100644 --- a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/IfmUtil.java +++ b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/IfmUtil.java @@ -198,7 +198,8 @@ public class IfmUtil { if(L2vlan.class.equals(ifType)){ IfL2vlan vlanIface = interfaceInfo.getAugmentation(IfL2vlan.class); LOG.trace("L2Vlan: {}",vlanIface); - long vlanVid = (vlanIface == null) ? 0 : vlanIface.getVlanId().getValue(); + long vlanVid = (vlanIface == null) ? 0 : + vlanIface.getVlanId() == null ? 0 : vlanIface.getVlanId().getValue(); if (vlanVid != 0) { listActionInfo.add(new ActionInfo(ActionType.push_vlan, new String[] {}, actionKeyStart)); actionKeyStart++; -- 2.36.6