[incubator-servicecomb-saga] 05/07: SCB-138 remove useless code

[se...@apache.org]

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

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

commit 26ef883b552102d5a8545079929c2affe4d6b8db
Author: Eric Lee <da...@huawei.com>
AuthorDate: Wed Jan 3 22:10:08 2018 +0800

    SCB-138 remove useless code
    
    Signed-off-by: Eric Lee <da...@huawei.com>
---
 .../servicecomb/saga/alpha/server/GrpcTxEventStreamObserver.java     | 5 ++++-
 .../apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java   | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventStreamObserver.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventStreamObserver.java
index 6a2ae8e..623355c 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventStreamObserver.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventStreamObserver.java
@@ -93,11 +93,14 @@ class GrpcTxEventStreamObserver implements StreamObserver<GrpcTxEvent> {
   @Override
   public void onError(Throwable t) {
     LOG.error("failed to process grpc message.", t);
-    onCompleted();
+    responseObserver.onCompleted();
+    removeInvalidCallback();
   }
 
+  // unless we shutdown the alpha server gracefully, this method should never be called
   @Override
   public void onCompleted() {
+    LOG.info("disconnect the grpc client");
     responseObserver.onCompleted();
     removeInvalidCallback();
   }
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
index ca4b7bd..55c095e 100644
--- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
@@ -124,8 +124,6 @@ public class AlphaIntegrationTest {
     requestObserver.onNext(someGrpcEvent(TxAbortedEvent));
 
     await().atMost(1, SECONDS).until(() -> receivedCommands.size() > 1);
-    System.out.println(receivedCommands.size());
-    receivedCommands.forEach((command) -> System.out.println(command.getCompensateMethod()));
     assertThat(receivedCommands, containsInAnyOrder(
         GrpcCompensateCommand.newBuilder().setGlobalTxId(globalTxId).setLocalTxId(localTxId).setParentTxId(parentTxId)
             .setCompensateMethod("method a").setPayloads(ByteString.copyFrom("service a".getBytes())).build(),

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