Thomas Vachuska
Committed by Brian O'Connor

ONOS-2025 Corrected a logic error in the flow rule store that crept in during a …

…recent refactor. (175e8fde)

Change-Id: I4a4cb097ba7aa23dd00ebe59e8ebbbff68630dae
...@@ -412,6 +412,7 @@ public class NewDistributedFlowRuleStore ...@@ -412,6 +412,7 @@ public class NewDistributedFlowRuleStore
412 SERIALIZER::encode, 412 SERIALIZER::encode,
413 master) 413 master)
414 .whenComplete((result, error) -> { 414 .whenComplete((result, error) -> {
415 + if (error != null) {
415 log.warn("Failed to storeBatch: {} to {}", operation, master); 416 log.warn("Failed to storeBatch: {} to {}", operation, master);
416 417
417 Set<FlowRule> allFailures = operation.getOperations() 418 Set<FlowRule> allFailures = operation.getOperations()
...@@ -422,6 +423,7 @@ public class NewDistributedFlowRuleStore ...@@ -422,6 +423,7 @@ public class NewDistributedFlowRuleStore
422 notifyDelegate(FlowRuleBatchEvent.completed( 423 notifyDelegate(FlowRuleBatchEvent.completed(
423 new FlowRuleBatchRequest(operation.id(), Collections.emptySet()), 424 new FlowRuleBatchRequest(operation.id(), Collections.emptySet()),
424 new CompletedBatchOperation(false, allFailures, deviceId))); 425 new CompletedBatchOperation(false, allFailures, deviceId)));
426 + }
425 }); 427 });
426 } 428 }
427 429
......