From: Arunprakash D <d.arunprakash@ericsson.com>
Date: Mon, 19 Nov 2018 15:21:17 +0000 (+0000)
Subject: Merge "improve fixed incorrect Future usage in (Bundle)FlowForwarder"
X-Git-Tag: release/neon~45
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=24f53bdcde913e2c5a79361e388906839fab62c0;hp=0d77dfe5418dee2d63ebce2ac6d6cd4ce8797749;p=openflowplugin.git

Merge "improve fixed incorrect Future usage in (Bundle)FlowForwarder"
---

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java
index 351f703dbb..2110297361 100644
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java
@@ -245,6 +245,7 @@ public class BundleFlowForwarder {
         @Override
         public void onFailure(Throwable throwable) {
             LOG.error("Error while pushing flow add bundle {} for device {}", message, nodeId);
+            resultFuture.setException(throwable);
         }
     }
 }
diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java
index 00eda3f7c1..58ccf15600 100644
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java
@@ -410,6 +410,7 @@ public class FlowForwarder extends AbstractListeningCommiter<Flow> {
         public void onFailure(Throwable throwable) {
             LOG.error("Service call for adding flow with id {} failed for node {}",
                     getFlowId(addFlowInput.getFlowRef()), nodeId, throwable);
+            resultFuture.setException(throwable);
         }
     }
 
@@ -459,6 +460,7 @@ public class FlowForwarder extends AbstractListeningCommiter<Flow> {
         public void onFailure(Throwable throwable) {
             LOG.error("Service call for updating flow with id {} failed for node {}",
                     getFlowId(updateFlowInput.getFlowRef()), nodeId, throwable);
+            resultFuture.setException(throwable);
         }
     }
 }