BUG-2138: Fix shard registration with ProxyProducers.

Change-Id: I42f8f3cfaf9c0ef20b247abff2bec966ce5eeaa4
Signed-off-by: Tomas Cere <tcere@cisco.com>

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 9c5f5b21df73df9ef89b914401630586bd14bab5..69dfe4c7b7335186edd00aaf5384e9e45d6c2354 100644 (file)
--- 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
@@ -293,6 +293,10 @@ public class DistributedShardedDOMDataTree implements DOMDataTreeService, DOMDat
 
         LOG.debug("Registering shard[{}] at prefix: {}", shard, prefix);
 
+        if (producer instanceof ProxyProducer) {
+            return shardedDOMDataTree.registerDataTreeShard(prefix, shard, ((ProxyProducer) producer).delegate());
+        }
+
         return shardedDOMDataTree.registerDataTreeShard(prefix, shard, producer);
     }