From: Tomas Olvecky <tolvecky@cisco.com>
Date: Fri, 15 Nov 2013 14:37:06 +0000 (+0100)
Subject: Config-manager: add synchronized to BlankTransactionServiceTracker.
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~393^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=5e69dffce5194120f21379468f2f05cc0611be47

Config-manager: add synchronized to BlankTransactionServiceTracker.

Add synchronization mechanism to prevent ConflictingVersionException when loading bundles in parallel.

Change-Id: I993b090cf8a106046d95b64fca89472121918407
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>
---

diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTracker.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTracker.java
index 106a7fbb2b..de1a425ce6 100644
--- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTracker.java
+++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/BlankTransactionServiceTracker.java
@@ -37,7 +37,7 @@ public class BlankTransactionServiceTracker implements ServiceTrackerCustomizer<
         return null;
     }
 
-    private void blankTransaction() {
+    private synchronized void blankTransaction() {
         // create transaction
         ObjectName tx = configRegistry.beginConfig();
         CommitStatus commitStatus = configRegistry.commitConfig(tx);