| commit | a97632bac614dd07853ee26444f27030d682e9d2 | [log] [tgz] |
|---|---|---|
| author | yoshi <yoshi@onlab.us> | Tue Dec 17 15:46:08 2013 -0800 |
| committer | yoshi <yoshi@onlab.us> | Tue Dec 17 15:46:08 2013 -0800 |
| tree | fea91922331a525f212eb494f9c26893523dfdfb | |
| parent | 40a4a45db0c1eb54dcb2bf1948bf2370de4f3e9b [diff] |
Fixed bugs
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 95185b9..ec27a0f 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java +++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
@@ -642,7 +642,9 @@ FlowEntry flowEntry = new FlowEntry(); flowEntry.setFlowEntryId(new FlowEntryId(flowEntryIdStr)); flowEntry.setDpid(new Dpid(switchDpidStr)); - + flowEntry.setIdleTimeout(idleTimeout); + flowEntry.setHardTimeout(hardTimeout); + // // Extract the match conditions //
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 0f9ed91..9df6cae 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java +++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -376,7 +376,7 @@ FlowEntryId flowEntryId) { // Find the Flow Entry FlowEntry flowEntry = datagridService.getFlowEntry(flowEntryId); - if (flowEntryId == null) + if (flowEntry == null) return; // Flow Entry not found // Find the Flow Path