Revert "Bug 6745 Do not ignore syncup return value"

This reverts commit df561a83c33b7af9818d8d0d0e8e6b00f7a37a93.

Change-Id: I9133264ba297bf4293a50e26e1d2e1051df1f093
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 4393b05d8f846db1b07b2e4f7c7921212fd34e46..f5894de2d7f439fb105cd81ae4c5c43c00f9324a 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,10 +41,9 @@ public class SyncReactorFutureZipDecorator extends SyncReactorFutureDecorator {
             compressionGuard.acquire();
             final boolean newTaskNecessary = updateCompressionState(flowcapableNodePath, syncupEntry);
             if (newTaskNecessary) {
-                return super.syncup(flowcapableNodePath, syncupEntry);
-            } else {
-                return Futures.immediateFuture(Boolean.TRUE);
+                super.syncup(flowcapableNodePath, syncupEntry);
             }
+            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 32449eb87b33338cba59eddd55064d3cafc229d6..c49ab73a94701ea965904cb77d07004b5e7798f7 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.successfulAsList(allResults).get(1, TimeUnit.SECONDS);
+        Futures.allAsList(allResults).get(1, TimeUnit.SECONDS);
         LOG.info("all configs done");
 
         syncThreadPool.shutdown();