BUG-5280: implement message queueing

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / DatastoreContextIntrospector.java

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 094bb4a9e1d323debd66f207cab3626217c93116..0ef281319cd2ddbf6077099c0df8cf86b752d927 100644 (file)
--- 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
@@ -203,7 +203,7 @@ public class DatastoreContextIntrospector {
         }
 
         Builder builder = DatastoreContext.newBuilderFrom(context);
-        String dataStoreTypePrefix = context.getDataStoreType() + '.';
+        String dataStoreTypePrefix = context.getDataStoreName() + '.';
         final String shardNamePrefix = forShardName + '.';
 
         List<String> keys = getSortedKeysByDatastoreType(currentProperties.keySet(), dataStoreTypePrefix);
@@ -242,7 +242,7 @@ public class DatastoreContextIntrospector {
 
         Builder builder = DatastoreContext.newBuilderFrom(context);
 
-        final String dataStoreTypePrefix = context.getDataStoreType() + '.';
+        final String dataStoreTypePrefix = context.getDataStoreName() + '.';
 
         List<String> keys = getSortedKeysByDatastoreType(Collections.list(properties.keys()), dataStoreTypePrefix);
 
@@ -270,7 +270,7 @@ public class DatastoreContextIntrospector {
         return updated;
     }
 
-    private ArrayList<String> getSortedKeysByDatastoreType(Collection<String> inKeys,
+    private static ArrayList<String> getSortedKeysByDatastoreType(Collection<String> inKeys,
             final String dataStoreTypePrefix) {
         // Sort the property keys by putting the names prefixed with the data store type last. This
         // is done so data store specific settings are applied after global settings.