[incubator-servicecomb-saga] branch SCB-212_tx_timeout updated: SCB-212 closed sender after each test to avoid test interference

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

seanyinx pushed a commit to branch SCB-212_tx_timeout
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git


The following commit(s) were added to refs/heads/SCB-212_tx_timeout by this push:
     new 476be8f  SCB-212 closed sender after each test to avoid test interference
476be8f is described below

commit 476be8f7db5b0be775b6bae97468dc8c2a82339c
Author: seanyinx <se...@huawei.com>
AuthorDate: Thu Jan 11 14:51:09 2018 +0800

    SCB-212 closed sender after each test to avoid test interference
    
    Signed-off-by: seanyinx <se...@huawei.com>
---
 .../saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java    | 3 ---
 .../omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java     | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java
index d441040..6eae8a3 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java
@@ -99,7 +99,6 @@ public class LoadBalancedClusterMessageSender implements MessageSender {
     senders.keySet().forEach(sender -> {
       try {
         sender.onConnected();
-        senders.put(sender, 0L);
       } catch (Exception e) {
         log.error("Failed connecting to alpha at {}", sender.target(), e);
       }
@@ -111,12 +110,10 @@ public class LoadBalancedClusterMessageSender implements MessageSender {
     senders.keySet().forEach(sender -> {
       try {
         sender.onDisconnected();
-        senders.put(sender, Long.MAX_VALUE);
       } catch (Exception e) {
         log.error("Failed disconnecting from alpha at {}", sender.target(), e);
       }
     });
-
   }
 
   @Override
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java
index 24326e3..f280de0 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java
@@ -133,6 +133,8 @@ public class LoadBalancedClusterMessageSenderTest {
 
   @After
   public void after() throws Exception {
+    messageSender.onDisconnected();
+    messageSender.close();
     eventsMap.values().forEach(Queue::clear);
     connected.values().forEach(Queue::clear);
   }
@@ -242,7 +244,6 @@ public class LoadBalancedClusterMessageSenderTest {
 
   @Test
   public void considerFasterServerFirst() throws Exception {
-    messageSender.onConnected();
     // we don't know which server is selected at first
     messageSender.send(event);
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>'].