X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDatastoreContextIntrospector.java;h=6685f645e8037d2c06f99a06b9793cc8ddb7440a;hb=2bc808b02828fde2da3dd9bfabab658156faa3c6;hp=1f0911851089d37aaf33e8d4350c39307394ffbd;hpb=925cb4a228d0fda99c7bfeb432eb25285a223887;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java
index 1f09118510..6685f645e8 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import javax.annotation.concurrent.GuardedBy;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.text.WordUtils;
 import org.opendaylight.controller.cluster.datastore.DatastoreContext.Builder;
@@ -182,14 +183,16 @@ public class DatastoreContextIntrospector {
                 propertyName, type));
     }
 
+    @GuardedBy(value = "this")
     private DatastoreContext context;
+    @GuardedBy(value = "this")
     private Map<String, Object> currentProperties;
 
     public DatastoreContextIntrospector(DatastoreContext context) {
         this.context = context;
     }
 
-    public DatastoreContext getContext() {
+    public synchronized DatastoreContext getContext() {
         return context;
     }