From 6ea2beb7a1074c1cae20fac216bd14e2b3048cc2 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 --- .../org/opendaylight/vpnservice/interfacemgr/IfmUtil.java | 3 ++- .../interfacemgr/commons/AlivenessMonitorUtils.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) 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++; diff --git a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/commons/AlivenessMonitorUtils.java b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/commons/AlivenessMonitorUtils.java index abc3b2c8..27795c2c 100644 --- a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/commons/AlivenessMonitorUtils.java +++ b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/commons/AlivenessMonitorUtils.java @@ -66,7 +66,7 @@ public class AlivenessMonitorUtils { public static void startLLDPMonitoring(AlivenessMonitorService alivenessMonitorService, DataBroker dataBroker, Interface trunkInterface) { //LLDP monitoring for the trunk interface - String trunkInterfaceName = trunkInterface.getName(); + /*String trunkInterfaceName = trunkInterface.getName(); IfTunnel ifTunnel = trunkInterface.getAugmentation(IfTunnel.class); if(ifTunnel.getTunnelInterfaceType().isAssignableFrom(TunnelTypeVxlan.class)) { MonitorStartInput lldpMonitorInput = new MonitorStartInputBuilder().setConfig(new ConfigBuilder() @@ -90,12 +90,12 @@ public class AlivenessMonitorUtils { } catch (InterruptedException | ExecutionException e) { LOG.warn("Exception when starting monitoring", e); } - } + }*/ } public static void stopLLDPMonitoring(AlivenessMonitorService alivenessMonitorService, DataBroker dataBroker, Interface trunkInterface) { - IfTunnel ifTunnel = trunkInterface.getAugmentation(IfTunnel.class); + /*IfTunnel ifTunnel = trunkInterface.getAugmentation(IfTunnel.class); if(!ifTunnel.getTunnelInterfaceType().isAssignableFrom(TunnelTypeVxlan.class)){ return; } @@ -113,7 +113,7 @@ public class AlivenessMonitorUtils { removeMonitorIdFromInterfaceMonitorIdMap(dataBroker, interfaceName, monitorId); return; } - } + }*/ } public static String getInterfaceFromMonitorId(DataBroker broker, Long monitorId) { -- 2.36.6