Enable checkstyle rule to find empty code blocks
Enabled checkstyle rule that detects empty code blocks and fixed the
violations that were discovered.
Change-Id: Icc23e028f2bbabc1849ec566923aa125b2486a3b
diff --git a/src/main/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManager.java
index 7497106..6e0dc69 100644
--- a/src/main/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -385,7 +385,11 @@
*/
protected void removeFromQuarantineQueue(NodePortTuple npt) {
// Remove all occurrences of the node port tuple from the list.
- while (quarantineQueue.remove(npt)) { }
+ boolean removedSomething;
+
+ do {
+ removedSomething = quarantineQueue.remove(npt);
+ } while (removedSomething);
}
/**
@@ -408,7 +412,10 @@
*/
protected void removeFromMaintenanceQueue(NodePortTuple npt) {
// Remove all occurrences of the node port tuple from the queue.
- while (maintenanceQueue.remove(npt)) { }
+ boolean removedSomething;
+ do {
+ removedSomething = maintenanceQueue.remove(npt);
+ } while (removedSomething);
}
/**
@@ -1335,8 +1342,10 @@
private void processNewPort(long sw, short p) {
if (isLinkDiscoverySuppressed(sw, p)) {
// Do nothing as link discovery is suppressed.
+ return;
} else if (autoPortFastFeature && isFastPort(sw, p)) {
// Do nothing as the port is a fast port.
+ return;
} else {
NodePortTuple npt = new NodePortTuple(sw, p);
discover(sw, p);