From 5e69dffce5194120f21379468f2f05cc0611be47 Mon Sep 17 00:00:00 2001 From: Tomas Olvecky Date: Fri, 15 Nov 2013 15:37:06 +0100 Subject: [PATCH] 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 --- .../manager/impl/osgi/BlankTransactionServiceTracker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.36.6