From c8162bbd822046c8713816258513b6def390dad8 Mon Sep 17 00:00:00 2001
From: Srinivasan Ramasubramanian <srini@bigswitch.com>
Date: Tue, 5 Feb 2013 16:47:35 -0800
Subject: [PATCH] Fix NPE in LinkDiscoveryManager.java
---
.../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 ff27401d0..99dfc0a34 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -1477,6 +1477,8 @@ public class LinkDiscoveryManager implements IOFMessageListener,
}
IOFSwitch iofSwitch = floodlightProvider.getSwitches().get(sw);
+ if (iofSwitch == null) return;
+
if (autoPortFastFeature && iofSwitch.isFastPort(p)) {
// Do nothing as the port is a fast port.
return;
--
GitLab