InstallationFuture: latch after setting error info
Change-Id: Ib7d1f01228a792707a865f71f19c0d3fa96dc1f0
Showing
1 changed file
with
1 additions
and
1 deletions
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 | ... | @@ -396,7 +396,6 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr |
| 396 | public void fail(OFErrorMsg msg, Dpid dpid) { | 396 | public void fail(OFErrorMsg msg, Dpid dpid) { |
| 397 | 397 | ||
| 398 | ok.set(false); | 398 | ok.set(false); |
| 399 | - removeRequirement(dpid); | ||
| 400 | FlowEntry fe = null; | 399 | FlowEntry fe = null; |
| 401 | FlowRuleBatchEntry fbe = fms.get(msg.getXid()); | 400 | FlowRuleBatchEntry fbe = fms.get(msg.getXid()); |
| 402 | failedId = fbe.id(); | 401 | failedId = fbe.id(); |
| ... | @@ -446,6 +445,7 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr | ... | @@ -446,6 +445,7 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr |
| 446 | } | 445 | } |
| 447 | offendingFlowMods.add(fe); | 446 | offendingFlowMods.add(fe); |
| 448 | 447 | ||
| 448 | + removeRequirement(dpid); | ||
| 449 | } | 449 | } |
| 450 | 450 | ||
| 451 | 451 | ... | ... |
-
Please register or login to post a comment