From: Ed Warnicke <eaw@cisco.com>
Date: Fri, 7 Feb 2014 06:36:35 +0000 (+0000)
Subject: Merge "Fixed publishDataChangeEvent in 2phase commit"
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~513
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=3948bedd0129e44c0943bd77c91806425645cd72;hp=6fd408a04fe4a3611843e2246ece6d7c34b76903

Merge "Fixed publishDataChangeEvent in 2phase commit"
---

diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
index 2c3b0188f4..7c6f52f110 100644
--- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
+++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
@@ -332,21 +332,23 @@ package class TwoPhaseCommit<P extends Path<P>, D, DCL extends DataChangeListene
     }
 
     def void publishDataChangeEvent(ImmutableList<ListenerStateCapture<P, D, DCL>> listeners) {
-        for (listenerSet : listeners) {
-            val updatedConfiguration = dataBroker.readConfigurationData(listenerSet.path);
-            val updatedOperational = dataBroker.readOperationalData(listenerSet.path);
-
-            val changeEvent = new DataChangeEventImpl(transaction, listenerSet.initialConfigurationState,
-                listenerSet.initialOperationalState, updatedOperational, updatedConfiguration);
-            for (listener : listenerSet.listeners) {
-                try {
-                    listener.instance.onDataChanged(changeEvent);
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
+        dataBroker.executor.submit [|
+            for (listenerSet : listeners) {
+                val updatedConfiguration = dataBroker.readConfigurationData(listenerSet.path);
+                val updatedOperational = dataBroker.readOperationalData(listenerSet.path);
+
+                val changeEvent = new DataChangeEventImpl(transaction, listenerSet.initialConfigurationState,
+                    listenerSet.initialOperationalState, updatedOperational, updatedConfiguration);
+                for (listener : listenerSet.listeners) {
+                    try {
+                        listener.instance.onDataChanged(changeEvent);
+
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }        
+        ]
     }
 
     def rollback(List<DataCommitTransaction<P, D>> transactions, Exception e) {