From 12a8bc24003b3d044e7cc2859a6e31d4d50fce42 Mon Sep 17 00:00:00 2001
From: Srinivasan Ramasubramanian <srini@bigswitch.com>
Date: Tue, 14 Aug 2012 00:50:04 -0700
Subject: [PATCH] Fix a posisble NPE in LinkDiscoveryManager.
---
.../linkdiscovery/internal/LinkDiscoveryManager.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index 9be193821..f3bb22a28 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -478,6 +478,7 @@ IFloodlightModule, IInfoProvider, IHAListener {
// Send standard LLDPs
for (long sw: switches) {
IOFSwitch iofSwitch = floodlightProvider.getSwitches().get(sw);
+ if (iofSwitch == null) continue;
if (iofSwitch.getEnabledPorts() != null) {
for (OFPhysicalPort p : iofSwitch.getEnabledPorts()) {
// sends only forward LLDPs and BDDPs
@@ -488,6 +489,7 @@ IFloodlightModule, IInfoProvider, IHAListener {
for (long sw: switches) {
IOFSwitch iofSwitch = floodlightProvider.getSwitches().get(sw);
+ if (iofSwitch == null) continue;
if (iofSwitch.getEnabledPorts() != null) {
for (OFPhysicalPort p : iofSwitch.getEnabledPorts()) {
// sends only forward LLDPs and BDDPs
--
GitLab