[incubator-ratis] branch master updated: RATIS-604. OrderedRequestStreamObserver does not cleanup when responding error. Contributed by Lokesh Jain

[szetszwo]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 2337318  RATIS-604. OrderedRequestStreamObserver does not cleanup when 
responding error.  Contributed by Lokesh Jain
2337318 is described below

commit 23373189a74d6fbe736490350dfc1cd489064b99
Author: Tsz Wo Nicholas Sze <szets...@apache.org>
AuthorDate: Fri Jun 28 16:42:05 2019 +0800

    RATIS-604. OrderedRequestStreamObserver does not cleanup when responding 
error.  Contributed by Lokesh Jain
---
 .../apache/ratis/grpc/client/GrpcClientProtocolService.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolService.java
 
b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolService.java
index 772e586..2345536 100644
--- 
a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolService.java
+++ 
b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolService.java
@@ -375,15 +375,19 @@ public class GrpcClientProtocolService extends 
RaftClientProtocolServiceImplBase
         if (complete) {
           responseCompleted();
         }
-        slidingWindow.close();
-        orderedStreamObservers.removeExisting(this);
+        cleanup();
       }
     }
 
+    private void cleanup() {
+      slidingWindow.close();
+      orderedStreamObservers.removeExisting(this);
+    }
+
     @Override
     boolean responseError(Throwable t, Supplier<String> message) {
       if (super.responseError(t, message)) {
-        close(false);
+        cleanup();
         return true;
       }
       return false;