BUG 6057: Rewrite ShardedDOMProducer to use new cursor api

[mdsal.git] / dom / mdsal-dom-inmemory-datastore / src / main / java / org / opendaylight / mdsal / dom / store / inmemory / AbstractDOMShardTreeChangePublisher.java

diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/AbstractDOMShardTreeChangePublisher.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/AbstractDOMShardTreeChangePublisher.java
index fc4ad229d978c76cf92a9cd0bf6d494ba8f88855..086689f2c1e0e14e39eb91def9d2c08d384cff51 100644 (file)
--- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/AbstractDOMShardTreeChangePublisher.java
+++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/AbstractDOMShardTreeChangePublisher.java
@@ -126,7 +126,6 @@ abstract class AbstractDOMShardTreeChangePublisher extends AbstractDOMStoreTreeC
 
     private static final class DOMDataTreeListenerWithSubshards implements DOMDataTreeChangeListener {
 
-        // TODO should we synchronize the access to the dataTree snapshots?
         private final DataTree dataTree;
         private final YangInstanceIdentifier listenerPath;
         private final DOMDataTreeChangeListener delegate;
@@ -145,14 +144,14 @@ abstract class AbstractDOMShardTreeChangePublisher extends AbstractDOMStoreTreeC
         @Override
         public void onDataTreeChanged(@Nonnull final Collection<DataTreeCandidate> changes) {
             LOG.debug("Received data changed {}", changes.iterator().next());
-            final DataTreeCandidate newCandidate = applyChanges(changes);
-            delegate.onDataTreeChanged(Collections.singleton(newCandidate));
+            delegate.onDataTreeChanged(changes);
         }
 
         void onDataTreeChanged(final YangInstanceIdentifier rootPath, final Collection<DataTreeCandidate> changes) {
-            onDataTreeChanged(changes.stream()
+            final List<DataTreeCandidate> newCandidates = changes.stream()
                     .map(candidate -> DataTreeCandidates.newDataTreeCandidate(rootPath, candidate.getRootNode()))
-                    .collect(Collectors.toList()));
+                    .collect(Collectors.toList());
+            delegate.onDataTreeChanged(Collections.singleton(applyChanges(newCandidates)));
         }
 
         void addSubshard(final ChildShardContext context) {
@@ -167,7 +166,7 @@ abstract class AbstractDOMShardTreeChangePublisher extends AbstractDOMStoreTreeC
         }
 
         void close() {
-            for (ListenerRegistration<DOMDataTreeChangeListener> registration : registrations.values()) {
+            for (final ListenerRegistration<DOMDataTreeChangeListener> registration : registrations.values()) {
                 registration.close();
             }
             registrations.clear();