From 6b702311a1929905958b1915a9b950e1a169ac26 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Thu, 2 Jan 2014 16:50:17 -0800 Subject: [PATCH] Check for null srcNodeId and srcNodeConnectorId In response to comment here: https://git.opendaylight.org/gerrit/#/c/3926/2/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/utils/LLDPDiscoveryUtils.java Change-Id: I19f17f97a74bb3e9e7a7f1837e3484a3c5d32f53 Signed-off-by: Ed Warnicke --- .../topology/lldp/utils/LLDPDiscoveryUtils.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/utils/LLDPDiscoveryUtils.java b/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/utils/LLDPDiscoveryUtils.java index d5dee32e40..716b1f281a 100644 --- a/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/utils/LLDPDiscoveryUtils.java +++ b/opendaylight/md-sal/topology-lldp-discovery/src/main/java/org/opendaylight/md/controller/topology/lldp/utils/LLDPDiscoveryUtils.java @@ -61,12 +61,13 @@ public class LLDPDiscoveryUtils { srcNodeId = new NodeId(srcNodeIdString); } } - - InstanceIdentifier srcInstanceId = InstanceIdentifier.builder(Nodes.class) - .child(Node.class,new NodeKey(srcNodeId)) - .child(NodeConnector.class, new NodeConnectorKey(srcNodeConnectorId)) - .toInstance(); - return new NodeConnectorRef(srcInstanceId); + if(srcNodeId != null && srcNodeConnectorId != null) { + InstanceIdentifier srcInstanceId = InstanceIdentifier.builder(Nodes.class) + .child(Node.class,new NodeKey(srcNodeId)) + .child(NodeConnector.class, new NodeConnectorKey(srcNodeConnectorId)) + .toInstance(); + return new NodeConnectorRef(srcInstanceId); + } } catch (Exception e) { LOG.warn("Caught exception ", e); } -- 2.36.6