Bug 2071: Improved Null checking and logging in LLDPSpeaker

Change-Id: Ic2717fd5f5abd163f334ef668e6027b525315dd1
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/lldp/LLDPSpeaker.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/lldp/LLDPSpeaker.java
index e258cfd2c3005976a3f950d4386b398aff5cf304..8709f140fb88fea9b43f64d02a1aefc9ae4a1a5d 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/lldp/LLDPSpeaker.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/lldp/LLDPSpeaker.java
@@ -81,11 +81,25 @@ public class LLDPSpeaker {
         TransmitPacketInputBuilder tpib = new TransmitPacketInputBuilder();
         tpib.setEgress(new NodeConnectorRef(nodeConnectorInstanceId));
         tpib.setNode(new NodeRef(nodeInstanceId));
-        tpib.setPayload(lldpDataFrom(nodeInstanceId, nodeConnectorInstanceId, flowConnector.getHardwareAddress(),
-                md.getSessionContext().getPrimaryConductor().getVersion()));
-        nodeConnectorMap.put(nodeConnectorInstanceId, tpib.build());
-
-        md.transmitPacket(nodeConnectorMap.get(nodeConnectorInstanceId));
+        if(nodeInstanceId == null) {
+            LOG.warn("addNodeConnector(): nodeInstanceId should not be null nodeConnectorInstanceId {} nodeConnector {}",nodeConnectorInstanceId,nodeConnector);
+        } else if (nodeConnectorInstanceId == null) {
+            LOG.warn("addNodeConnector(): nodeConnectorInstanceId should not be null nodeConnectorInstanceId {} nodeConnector {}",nodeConnectorInstanceId,nodeConnector);
+        } else if (flowConnector == null) {
+            LOG.warn("addNodeConnector(): flowConnector should not be null nodeConnectorInstanceId {} nodeConnector {}",nodeConnectorInstanceId,nodeConnector);
+        } else if (md == null) {
+            LOG.warn("addNodeConnector(): md should not be null nodeConnectorInstanceId {} nodeConnector {}",nodeConnectorInstanceId,nodeConnector);
+        } else if(md.getSessionContext() == null) {
+            LOG.warn("addNodeConnector(): md.getSessionContext() should not be null nodeConnectorInstanceId {} nodeConnector {}",nodeConnectorInstanceId,nodeConnector);
+        } else if (md.getSessionContext().getPrimaryConductor() == null) {
+            LOG.warn("addNodeConnector(): md.getSessionContext().getPrimaryConductor() should not be null nodeConnectorInstanceId {} nodeConnector {}",nodeConnectorInstanceId,nodeConnector);
+        } else {
+            tpib.setPayload(lldpDataFrom(nodeInstanceId,nodeConnectorInstanceId,flowConnector.getHardwareAddress(),
+                    md.getSessionContext().getPrimaryConductor().getVersion()));
+            nodeConnectorMap.put(nodeConnectorInstanceId, tpib.build());
+
+            md.transmitPacket(nodeConnectorMap.get(nodeConnectorInstanceId));
+        }
     }
 
     public void removeNodeConnector(