Fix a bug inside the FlowManager: don't push Flow Entries to the datagrid
if the Flow Entry ID is not valid.
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
index d3b5375..f82a06d 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -518,6 +518,9 @@
for (FlowPathEntryPair flowPair : modifiedFlowEntries) {
FlowEntry flowEntry = flowPair.flowEntry;
+ if (! flowEntry.isValidFlowEntryId())
+ continue;
+
IOFSwitch mySwitch = mySwitches.get(flowEntry.dpid().value());
//
@@ -536,8 +539,6 @@
FlowEntryUserState.FE_USER_DELETE) {
continue;
}
- if (! flowEntry.isValidFlowEntryId())
- continue;
}
log.debug("Pushing Flow Entry To Datagrid: {}", flowEntry.toString());