Merge pull request #14 from y-higuchi/RAMCloud-yoshi
Fix commit location for measurement
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 6beb6d8..1fc70ec 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
@@ -420,9 +420,9 @@
if (measureONOSFlowEntryTimeProp) {
startSetProperties = System.nanoTime();
}
-
+
FlowProperty flowProp = new FlowProperty(dbHandler, flowEntryObj);
-
+
//
// Set the Flow Entry key:
// - flowEntry.flowEntryId()
@@ -616,6 +616,7 @@
if (measureONOSFlowEntryTimeProp) {
numProperties += 2;
}
+ flowProp.commitProperties();
//
// TODO: Take care of the FlowEntryErrorState.
//
@@ -636,7 +637,6 @@
endAddEdgeBetweenFlowPath = System.nanoTime();
}
}
- flowProp.commitProperties();
if (measureONOSFlowEntryTimeProp) {
endAddFlowEntry = System.nanoTime();