Merge into master from pull request #272:

Fix a posisble NPE in LinkDiscoveryManager. (https://github.com/floodlight/floodlight/pull/272)

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