| commit | 6eb438a78b0f8aa62d737b3eb6f1aca141caa0bb | [log] [tgz] |
|---|---|---|
| author | alshabib <alshabibi.ali@gmail.com> | Wed Oct 01 16:39:37 2014 -0700 |
| committer | alshabib <alshabibi.ali@gmail.com> | Wed Oct 01 16:39:37 2014 -0700 |
| tree | 9569f2139771227deb178ddc95904aac9b43343d | |
| parent | e797a5dba6db21e4f347250a276caf4672d03478 [diff] [blame] |
fixes for office deployment Change-Id: I322dc856cb2f724e1860f3e30b3bcb5445c8fb65
diff --git a/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java index 89c3399..a6f5ebb 100644 --- a/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java +++ b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
@@ -161,7 +161,11 @@ switch (stored.state()) { case ADDED: case PENDING_ADD: - frp.applyFlowRule(stored); + if (flowRule.expired()) { + event = store.removeFlowRule(flowRule); + } else { + frp.applyFlowRule(stored); + } break; case PENDING_REMOVE: case REMOVED: