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%2Fsharding%2FDistributedShardedDOMDataTree.java;h=e0d35580b82a2c8e35e490e660216e72465529b0;hb=refs%2Fchanges%2F00%2F84600%2F3;hp=11db817522b778705d7e24772c12b86d60ebfe36;hpb=e1ab83451c10cee6ad3f5e38d7a13c9c7d4501c1;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java index 11db817522..e0d35580b8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTree.java @@ -504,12 +504,13 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat ? distributedConfigDatastore.getActorUtils() : distributedOperDatastore.getActorUtils(); final Optional defaultLocalShardOptional = - actorUtils.findLocalShard(ClusterUtils.getCleanShardName(YangInstanceIdentifier.EMPTY)); + actorUtils.findLocalShard(ClusterUtils.getCleanShardName(YangInstanceIdentifier.empty())); if (defaultLocalShardOptional.isPresent()) { LOG.debug("{}: Default shard for {} is already started, creating just frontend", memberName, logicalDatastoreType); - createShardFrontend(new DOMDataTreeIdentifier(logicalDatastoreType, YangInstanceIdentifier.EMPTY)); + createShardFrontend(new DOMDataTreeIdentifier(logicalDatastoreType, + YangInstanceIdentifier.empty())); } // The local shard isn't present - we assume that means the local member isn't in the replica list @@ -521,7 +522,7 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat // final Collection names = distributedConfigDatastore.getActorUtils().getConfiguration() // .getUniqueMemberNamesForAllShards(); // Await.result(FutureConverters.toScala(createDistributedShard( -// new DOMDataTreeIdentifier(logicalDatastoreType, YangInstanceIdentifier.EMPTY), names)), +// new DOMDataTreeIdentifier(logicalDatastoreType, YangInstanceIdentifier.empty()), names)), // SHARD_FUTURE_TIMEOUT_DURATION); // } catch (DOMDataTreeShardingConflictException e) { // LOG.debug("{}: Default shard for {} already registered, possibly due to other node doing it faster",