Using latest atomix release candidate + Updates to CopycatTransport
Change-Id: I960af428ff733ee7467024811e3b3470e951ecb7
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorState.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorState.java
index e8abfac..9b58226 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorState.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorState.java
@@ -24,6 +24,7 @@
import io.atomix.copycat.server.storage.snapshot.SnapshotReader;
import io.atomix.copycat.server.storage.snapshot.SnapshotWriter;
import io.atomix.resource.ResourceStateMachine;
+import io.atomix.resource.ResourceType;
import java.util.Arrays;
import java.util.HashMap;
@@ -72,6 +73,10 @@
ElectionState.class,
Registration.class);
+ public AtomixLeaderElectorState() {
+ super(new ResourceType(AtomixLeaderElector.class));
+ }
+
@Override
protected void configure(StateMachineExecutor executor) {
// Notification
@@ -261,7 +266,7 @@
}
private void onSessionEnd(Session session) {
- Commit<? extends AtomixLeaderElectorCommands.Listen> listener = listeners.remove(session);
+ Commit<? extends AtomixLeaderElectorCommands.Listen> listener = listeners.remove(session.id());
if (listener != null) {
listener.close();
}