Merge pull request #357 from kwanggithub/master

Squashed commit for floodlight subtree update glitch

src/main/java/net/floodlightcontroller/core/internal/Controller.java

@@ -977,6 +977,7 @@ public class Controller implements IFloodlightProviderService,
                     }
                     else {
                         logError(sw, error);
+
                         // allow registered listeners to receive error messages
                         shouldHandleMessage = true;
                     }

src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java

@@ -50,6 +50,4 @@ public class OFSwitchImpl extends OFSwitchBase {
     public List<Short> getUplinkPorts() {
         return null;
     }
-
-     
 }

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

@@ -558,8 +558,8 @@ public class LinkDiscoveryManager implements IOFMessageListener,
         }
 
         if (isLinkDiscoverySuppressed(sw, port)) {
-            /*
-             * Dont send LLDPs out of this port as suppressLLDPs set
+            /* Dont send LLDPs out of this port as suppressLLDPs set
+             * 
              */
             return;
         }