홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Madan Jampani
Committed by Gerrit Code Review
b06ccef1 1 parent e4583fd8

Fix CopycatTransportClient thread check + bump up atomix version to latest rc 

Change-Id: Ie66868ebaaa14ea36125e7f419ac3c3a887e9bce
Inline Side-by-side
Showing 2 changed files with 2 additions and 3 deletions
...@@ -37,18 +37,17 @@ public class CopycatTransportClient implements Client { ...@@ -37,18 +37,17 @@ public class CopycatTransportClient implements Client {
37 private final String clusterName; 37 private final String clusterName;
38 private final MessagingService messagingService; 38 private final MessagingService messagingService;
39 private final CopycatTransport.Mode mode; 39 private final CopycatTransport.Mode mode;
40 - private final ThreadContext context;
41 private final Set<CopycatTransportConnection> connections = Sets.newConcurrentHashSet(); 40 private final Set<CopycatTransportConnection> connections = Sets.newConcurrentHashSet();
42 41
43 CopycatTransportClient(String clusterName, MessagingService messagingService, CopycatTransport.Mode mode) { 42 CopycatTransportClient(String clusterName, MessagingService messagingService, CopycatTransport.Mode mode) {
44 this.clusterName = checkNotNull(clusterName); 43 this.clusterName = checkNotNull(clusterName);
45 this.messagingService = checkNotNull(messagingService); 44 this.messagingService = checkNotNull(messagingService);
46 this.mode = checkNotNull(mode); 45 this.mode = checkNotNull(mode);
47 - this.context = ThreadContext.currentContextOrThrow();
48 } 46 }
49 47
50 @Override 48 @Override
51 public CompletableFuture<Connection> connect(Address remoteAddress) { 49 public CompletableFuture<Connection> connect(Address remoteAddress) {
50 + ThreadContext context = ThreadContext.currentContextOrThrow();
52 CopycatTransportConnection connection = new CopycatTransportConnection( 51 CopycatTransportConnection connection = new CopycatTransportConnection(
53 nextConnectionId(), 52 nextConnectionId(),
54 CopycatTransport.Mode.CLIENT, 53 CopycatTransport.Mode.CLIENT,
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
78 <onos-build-conf.version>1.1</onos-build-conf.version> 78 <onos-build-conf.version>1.1</onos-build-conf.version>
79 <netty4.version>4.0.33.Final</netty4.version> 79 <netty4.version>4.0.33.Final</netty4.version>
80 <!-- TODO: replace with final release version when it is out --> 80 <!-- TODO: replace with final release version when it is out -->
81 - <atomix.version>0.1.0-beta4</atomix.version> 81 + <atomix.version>0.1.0-beta5</atomix.version>
82 <copycat.version>0.5.1.onos</copycat.version> 82 <copycat.version>0.5.1.onos</copycat.version>
83 <openflowj.version>0.9.1.onos</openflowj.version> 83 <openflowj.version>0.9.1.onos</openflowj.version>
84 <onos-maven-plugin.version>1.8-SNAPSHOT</onos-maven-plugin.version> 84 <onos-maven-plugin.version>1.8-SNAPSHOT</onos-maven-plugin.version>
......