commit 4c7946891b685517aac1dfa82047930d647616b4
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Sep 07 10:29:01 2016 -0700
committer Thomas Vachuska <tom@onlab.us> Mon Sep 12 18:00:14 2016 +0000
tree 9d296f445bc82522becb2e15b757833bf617164d
parent dfefecd5920203fff69afc7642dc2aa4935adca8

Provide hasFailed explicitly

Change-Id: I3bacbbfcc84259b8bb6904d21b45a1e9e9e60e7a

core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
index b386df4..9e0db6a 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -612,11 +612,11 @@
             this.pendingDevices = new HashSet<>();
         }
 
-        FlowOperationsProcessor(FlowOperationsProcessor src) {
+        FlowOperationsProcessor(FlowOperationsProcessor src, boolean hasFailed) {
             this.fops = src.fops;
             this.stages = Lists.newArrayList(src.stages);
             this.pendingDevices = new HashSet<>(src.pendingDevices);
-            this.hasFailed = src.hasFailed;
+            this.hasFailed = hasFailed;
         }
 
         @Override
@@ -649,15 +649,14 @@
         synchronized void satisfy(DeviceId devId) {
             pendingDevices.remove(devId);
             if (pendingDevices.isEmpty()) {
-                operationsService.execute(new FlowOperationsProcessor(this));
+                operationsService.execute(new FlowOperationsProcessor(this, hasFailed));
             }
         }
 
         synchronized void fail(DeviceId devId, Set<? extends FlowRule> failures) {
-            hasFailed = true;
             pendingDevices.remove(devId);
             if (pendingDevices.isEmpty()) {
-                operationsService.execute(new FlowOperationsProcessor(this));
+                operationsService.execute(new FlowOperationsProcessor(this, true));
             }
 
             FlowRuleOperations.Builder failedOpsBuilder = FlowRuleOperations.builder();