OPNFLWPLUG-987: Apps not getting proper notification for the port status messages

[openflowplugin.git] / openflowplugin-common / src / main / java / org / opendaylight / openflowplugin / common / txchain / TransactionChainManager.java

diff --git a/openflowplugin-common/src/main/java/org/opendaylight/openflowplugin/common/txchain/TransactionChainManager.java b/openflowplugin-common/src/main/java/org/opendaylight/openflowplugin/common/txchain/TransactionChainManager.java
index 16d25ab3478e80ab23b341d363fb5959bc3d793c..1c7627e4eaba69807d01cdfdc0d874c616fb2855 100755 (executable)
--- a/openflowplugin-common/src/main/java/org/opendaylight/openflowplugin/common/txchain/TransactionChainManager.java
+++ b/openflowplugin-common/src/main/java/org/opendaylight/openflowplugin/common/txchain/TransactionChainManager.java
@@ -158,6 +158,11 @@ public class TransactionChainManager implements TransactionChainListener, AutoCl
 
     @GuardedBy("txLock")
     public boolean submitTransaction() {
+        return submitTransaction(false);
+    }
+
+    @GuardedBy("txLock")
+    public boolean submitTransaction(boolean doSync) {
         synchronized (txLock) {
             if (!submitIsEnabled) {
                 if (LOG.isTraceEnabled()) {
@@ -178,11 +183,12 @@ public class TransactionChainManager implements TransactionChainListener, AutoCl
             lastSubmittedFuture = submitFuture;
             writeTx = null;
 
-            if (initCommit) {
+            if (initCommit || doSync) {
                 try {
                     submitFuture.get(5L, TimeUnit.SECONDS);
                 } catch (InterruptedException | ExecutionException | TimeoutException ex) {
-                    LOG.error("Exception during INITIAL transaction submitting. ", ex);
+                    LOG.error("Exception during INITIAL({}) || doSync({}) transaction submitting. ",
+                            initCommit, doSync, ex);
                     return false;
                 }
                 initCommit = false;