Minor speed-up related improvement: test the dataPathSummary string
later when it is actually needed.
Reviewed by: Jono
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FlowManager.java b/src/main/java/net/floodlightcontroller/flowcache/FlowManager.java
index ace006d..4de2cbc 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FlowManager.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FlowManager.java
@@ -267,11 +267,6 @@
counterAllFlowPaths++;
if (flowPathObj == null)
continue;
- String dataPathSummaryStr = flowPathObj.getDataPathSummary();
- if (dataPathSummaryStr == null)
- continue; // Could be invalid entry?
- if (dataPathSummaryStr.isEmpty())
- continue; // No need to maintain this flow
String srcDpidStr = flowPathObj.getSrcSwitch();
if (srcDpidStr == null)
@@ -289,6 +284,13 @@
if (mySwitch == null)
continue; // Ignore: not my responsibility
+ // Test the Data Path Summary string
+ String dataPathSummaryStr = flowPathObj.getDataPathSummary();
+ if (dataPathSummaryStr == null)
+ continue; // Could be invalid entry?
+ if (dataPathSummaryStr.isEmpty())
+ continue; // No need to maintain this flow
+
//
// Test whether we need to complete the Flow cleanup,
// if the Flow has been deleted by the user.