commit 804a4bb06ae79beef99a456af6bb2577c08ad13c
author Yuta HIGUCHI <y-higuchi@onlab.us> Thu Nov 27 09:37:34 2014 -0800
committer Yuta HIGUCHI <y-higuchi@onlab.us> Fri Nov 28 19:00:56 2014 -0800
tree 68a681e262f2d665ba07f2a5618cc2123034a8bf
parent ca867ac7867f7952a9eb8fce31e4dc9c8166e5fb

InstallationFuture: latch after setting error info

Change-Id: Ib7d1f01228a792707a865f71f19c0d3fa96dc1f0

providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java

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 348b294..9f26230 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 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 @@
             }
             offendingFlowMods.add(fe);
 
+            removeRequirement(dpid);
         }