Reverse earlier behavior of pushing deleted Flow Entries into the database.
Now the Flow Entries marked as deleted are not written to the database anymore.
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
index 3d7cdc7..f9e1bc4 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
@@ -172,13 +172,9 @@
// flowPath.dataPath().flowEntries()
//
for (FlowEntry flowEntry : flowPath.dataPath().flowEntries()) {
- // TODO: not needed?
- /*
- if (! enableOnrc2014MeasurementsFlows) {
- if (flowEntry.flowEntryUserState() == FlowEntryUserState.FE_USER_DELETE)
- continue; // Skip: all Flow Entries were deleted earlier
+ if (flowEntry.flowEntryUserState() == FlowEntryUserState.FE_USER_DELETE) {
+ continue; // Skip: all Flow Entries were deleted earlier
}
- */
if (addFlowEntry(dbHandler, flowObj, flowEntry) == null) {
dbHandler.rollback();