Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump to odlparent 2.0.0
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
DelayedListenerRegistration.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedListenerRegistration.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedListenerRegistration.java
index 8d73bc6155d2c664ba6448a1085bbf85850d9606..e1c9f0ba2c8b84df5f8302ca7f74a679431786a2 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedListenerRegistration.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DelayedListenerRegistration.java
@@
-7,33
+7,32
@@
*/
package org.opendaylight.controller.cluster.datastore;
*/
package org.opendaylight.controller.cluster.datastore;
+import akka.actor.ActorRef;
import java.util.EventListener;
import javax.annotation.concurrent.GuardedBy;
import java.util.EventListener;
import javax.annotation.concurrent.GuardedBy;
+import org.opendaylight.controller.cluster.datastore.messages.ListenerRegistrationMessage;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
-abstract class DelayedListenerRegistration<L extends EventListener, M> implements ListenerRegistration<L> {
+class DelayedListenerRegistration<L extends EventListener, M extends ListenerRegistrationMessage>
+ implements ListenerRegistration<L> {
private final M registrationMessage;
private final M registrationMessage;
- private
volatile ListenerRegistration<L> delegate
;
+ private
final ActorRef registrationActor
;
@GuardedBy("this")
private boolean closed;
@GuardedBy("this")
private boolean closed;
- protected DelayedListenerRegistration(M registrationMessage) {
+ protected DelayedListenerRegistration(M registrationMessage
, ActorRef registrationActor
) {
this.registrationMessage = registrationMessage;
this.registrationMessage = registrationMessage;
+ this.registrationActor = registrationActor;
}
M getRegistrationMessage() {
return registrationMessage;
}
}
M getRegistrationMessage() {
return registrationMessage;
}
- ListenerRegistration<L> getDelegate() {
- return delegate;
- }
-
- synchronized <R extends ListenerRegistration<L>> void createDelegate(
- final LeaderLocalDelegateFactory<M, R> factory) {
+ synchronized void doRegistration(final AbstractDataListenerSupport<L, M> support) {
if (!closed) {
if (!closed) {
-
this.delegate = factory.createDelegate(registrationMessage
);
+
support.doRegistration(registrationMessage, registrationActor
);
}
}
}
}
@@
-50,11
+49,6
@@
abstract class DelayedListenerRegistration<L extends EventListener, M> implement
@Override
public synchronized void close() {
@Override
public synchronized void close() {
- if (!closed) {
- closed = true;
- if (delegate != null) {
- delegate.close();
- }
- }
+ closed = true;
}
}
}
}