commit 2374fc9e454aa586f77f270a856484aa4beb1bd7
author alshabib <alshabibi.ali@gmail.com> Wed Oct 22 11:03:23 2014 -0700
committer alshabib <alshabibi.ali@gmail.com> Wed Oct 22 11:03:23 2014 -0700
tree 26375c3a21108be5fcddd47002aa1b08ec4c2b3d
parent 2ca9cf2e5cba9347949a6105598485707a59da81

many fixes from different people in various place. Optical, FlowRuleManager, LinkDiscovery

Change-Id: Ie3302e80ee94bf2e41b3da7ac765557b1e7509fd

core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java

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 67e0867..01514d4 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
@@ -299,7 +299,8 @@
         private void extraneousFlow(FlowRule flowRule) {
             checkNotNull(flowRule, FLOW_RULE_NULL);
             checkValidity();
-            removeFlowRules(flowRule);
+            FlowRuleProvider frp = getProvider(flowRule.deviceId());
+            frp.removeFlowRule(flowRule);
             log.debug("Flow {} is on switch but not in store.", flowRule);
         }