Bug 6745 Do not ignore syncup return value

Change-Id: Ide811a0db0d684dc3b37ea3f6707d779162cb87f
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>

diff --git a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureZipDecorator.java b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureZipDecorator.java
index 3f7c78259854b9a86f6b498c32d35c3da988e014..0889216d894b1c09d6691717615c0338b1943df6 100644 (file)
--- a/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureZipDecorator.java
+++ b/applications/forwardingrules-sync/src/main/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureZipDecorator.java
@@ -41,9 +41,10 @@ public class SyncReactorFutureZipDecorator extends SyncReactorFutureDecorator {
             compressionGuard.acquire();
             final boolean newTaskNecessary = updateCompressionState(flowcapableNodePath, syncupEntry);
             if (newTaskNecessary) {
-                super.syncup(flowcapableNodePath, syncupEntry);
+                return super.syncup(flowcapableNodePath, syncupEntry);
+            } else {
+                return Futures.immediateFuture(Boolean.TRUE);
             }
-            return Futures.immediateFuture(Boolean.TRUE);
         } finally {
             compressionGuard.release();
         }

diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureZipDecoratorTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureZipDecoratorTest.java
index c49ab73a94701ea965904cb77d07004b5e7798f7..32449eb87b33338cba59eddd55064d3cafc229d6 100644 (file)
--- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureZipDecoratorTest.java
+++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/SyncReactorFutureZipDecoratorTest.java
@@ -112,7 +112,7 @@ public class SyncReactorFutureZipDecoratorTest {
         allResults.add(reactor.syncup(fcNodePath, fourth));
         latchForFirst.countDown();
 
-        Futures.allAsList(allResults).get(1, TimeUnit.SECONDS);
+        Futures.successfulAsList(allResults).get(1, TimeUnit.SECONDS);
         LOG.info("all configs done");
 
         syncThreadPool.shutdown();