Fix CopycatTransportClient thread check + bump up atomix version to latest rc
Change-Id: Ie66868ebaaa14ea36125e7f419ac3c3a887e9bce
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CopycatTransportClient.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CopycatTransportClient.java
index 607e25d..390cde3 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CopycatTransportClient.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/CopycatTransportClient.java
@@ -37,18 +37,17 @@
private final String clusterName;
private final MessagingService messagingService;
private final CopycatTransport.Mode mode;
- private final ThreadContext context;
private final Set<CopycatTransportConnection> connections = Sets.newConcurrentHashSet();
CopycatTransportClient(String clusterName, MessagingService messagingService, CopycatTransport.Mode mode) {
this.clusterName = checkNotNull(clusterName);
this.messagingService = checkNotNull(messagingService);
this.mode = checkNotNull(mode);
- this.context = ThreadContext.currentContextOrThrow();
}
@Override
public CompletableFuture<Connection> connect(Address remoteAddress) {
+ ThreadContext context = ThreadContext.currentContextOrThrow();
CopycatTransportConnection connection = new CopycatTransportConnection(
nextConnectionId(),
CopycatTransport.Mode.CLIENT,
diff --git a/pom.xml b/pom.xml
index 20d764c..6ba8318 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
<onos-build-conf.version>1.1</onos-build-conf.version>
<netty4.version>4.0.33.Final</netty4.version>
<!-- TODO: replace with final release version when it is out -->
- <atomix.version>0.1.0-beta4</atomix.version>
+ <atomix.version>0.1.0-beta5</atomix.version>
<copycat.version>0.5.1.onos</copycat.version>
<openflowj.version>0.9.1.onos</openflowj.version>
<onos-maven-plugin.version>1.8-SNAPSHOT</onos-maven-plugin.version>