Merge into master from pull request #234:

fix null pointer exception (https://github.com/floodlight/floodlight/pull/234)

src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java

@@ -357,6 +357,9 @@ IFloodlightModule, IInfoProvider, IHAListener {
                              boolean isReverse) {
 
         IOFSwitch iofSwitch = floodlightProvider.getSwitches().get(sw);
+        if (iofSwitch == null) {
+        	return;
+        }
         OFPhysicalPort ofpPort = iofSwitch.getPort(port);
 
         if (isLLDPSuppressed(sw, port)) {