Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add MutableUnsignedLongSet.addAll()
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ForwardingDataTreeChangeListener.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ForwardingDataTreeChangeListener.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ForwardingDataTreeChangeListener.java
index dd3155b8ebc958cddaa063b33d62e2e7b90b1e46..82a30b6c4050e59c02e6c873717f11023e51eebb 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ForwardingDataTreeChangeListener.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ForwardingDataTreeChangeListener.java
@@
-7,11
+7,14
@@
*/
package org.opendaylight.controller.cluster.datastore;
*/
package org.opendaylight.controller.cluster.datastore;
+import static java.util.Objects.requireNonNull;
+
import akka.actor.ActorRef;
import akka.actor.ActorSelection;
import akka.actor.ActorRef;
import akka.actor.ActorSelection;
-import com.google.common.base.Preconditions;
import java.util.Collection;
import java.util.Collection;
+import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.controller.cluster.datastore.messages.DataTreeChanged;
import org.opendaylight.controller.cluster.datastore.messages.DataTreeChanged;
+import org.opendaylight.controller.cluster.datastore.messages.OnInitialData;
import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
import org.slf4j.Logger;
import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
import org.slf4j.Logger;
@@
-26,19
+29,28
@@
final class ForwardingDataTreeChangeListener implements DOMDataTreeChangeListene
private static final Logger LOG = LoggerFactory.getLogger(ForwardingDataTreeChangeListener.class);
private final ActorSelection actor;
private static final Logger LOG = LoggerFactory.getLogger(ForwardingDataTreeChangeListener.class);
private final ActorSelection actor;
+ private final ActorRef sendingActor;
- ForwardingDataTreeChangeListener(final ActorSelection actor) {
- this.actor = Preconditions.checkNotNull(actor, "actor should not be null");
+ ForwardingDataTreeChangeListener(final ActorSelection actor, @Nullable final ActorRef sendingActor) {
+ this.actor = requireNonNull(actor, "actor should not be null");
+ this.sendingActor = sendingActor;
}
@Override
}
@Override
- public void onDataTreeChanged(Collection<DataTreeCandidate> changes) {
+ public void onDataTreeChanged(
final
Collection<DataTreeCandidate> changes) {
LOG.debug("Sending DataTreeChanged to {}", actor);
LOG.debug("Sending DataTreeChanged to {}", actor);
- actor.tell(new DataTreeChanged(changes), ActorRef.noSender());
+ actor.tell(new DataTreeChanged(changes), sendingActor);
+ }
+
+ @Override
+ public void onInitialData() {
+ LOG.debug("Sending OnInitialData to {}", actor);
+ actor.tell(OnInitialData.INSTANCE, sendingActor);
}
@Override
public String toString() {
}
@Override
public String toString() {
- return "ForwardingDataTreeChangeListener [actor=" + actor + "]";
+ return "ForwardingDataTreeChangeListener [actor=" + actor
+ + ", sending actor=" + (sendingActor != null ? sendingActor : "NO_SENDER") + "]";
}
}
}
}