From 804a4bb06ae79beef99a456af6bb2577c08ad13c Mon Sep 17 00:00:00 2001 From: Yuta HIGUCHI Date: Thu, 27 Nov 2014 09:37:34 -0800 Subject: [PATCH] InstallationFuture: latch after setting error info Change-Id: Ib7d1f01228a792707a865f71f19c0d3fa96dc1f0 --- .../onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java b/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java index 348b2944fe..9f26230115 100644 --- a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java +++ b/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java @@ -396,7 +396,6 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr public void fail(OFErrorMsg msg, Dpid dpid) { ok.set(false); - removeRequirement(dpid); FlowEntry fe = null; FlowRuleBatchEntry fbe = fms.get(msg.getXid()); failedId = fbe.id(); @@ -446,6 +445,7 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr } offendingFlowMods.add(fe); + removeRequirement(dpid); }