From 55160e3ebfd26f9bf0ee53c0487dbdcb3a18d8ed Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 29 Mar 2016 14:35:47 +0200 Subject: [PATCH] Use a static YangInstanceIdentifier in AbstractEntityOwnerChangeListener This will force reuse of the same YangInstanceIdentifier across instances. Change-Id: Iec33a79267e059ee7fad694a50f74dc2de87035b Signed-off-by: Robert Varga --- .../AbstractEntityOwnerChangeListener.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/AbstractEntityOwnerChangeListener.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/AbstractEntityOwnerChangeListener.java index b57f3c3246..eeda4f9374 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/AbstractEntityOwnerChangeListener.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/AbstractEntityOwnerChangeListener.java @@ -9,6 +9,7 @@ package org.opendaylight.controller.cluster.datastore.entityownership; import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.ENTITY_OWNERS_PATH; +import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.ENTITY_OWNER_QNAME; import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.ENTITY_QNAME; import org.opendaylight.controller.cluster.datastore.ShardDataTree; import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener; @@ -16,11 +17,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; -public abstract class AbstractEntityOwnerChangeListener implements DOMDataTreeChangeListener { +public abstract class AbstractEntityOwnerChangeListener implements DOMDataTreeChangeListener { + private static final YangInstanceIdentifier EOS_PATH = YangInstanceIdentifier.builder(ENTITY_OWNERS_PATH) + .node(EntityType.QNAME).node(EntityType.QNAME).node(ENTITY_QNAME).node(ENTITY_QNAME) + .node(ENTITY_OWNER_QNAME).build(); void init(ShardDataTree shardDataTree) { - shardDataTree.registerTreeChangeListener(YangInstanceIdentifier.builder(ENTITY_OWNERS_PATH). - node(EntityType.QNAME).node(EntityType.QNAME).node(ENTITY_QNAME).node(ENTITY_QNAME).node(EntityOwnersModel.ENTITY_OWNER_QNAME).build(), this); + shardDataTree.registerTreeChangeListener(EOS_PATH, this); } protected static String extractOwner(LeafNode ownerLeaf) { -- 2.36.6