JavaMuller
diff --git a/Collapse file
‎stub/src/main/java/io/grpc/stub/ClientCalls.java‎
Copy file name to clipboardExpand all lines: stub/src/main/java/io/grpc/stub/ClientCalls.java
+13-2Lines changed: 13 additions & 2 deletions b/Collapse file
‎stub/src/main/java/io/grpc/stub/ClientCalls.java‎
Copy file name to clipboardExpand all lines: stub/src/main/java/io/grpc/stub/ClientCalls.java
+13-2Lines changed: 13 additions & 2 deletions
@@ -167,7 +167,9 @@ private static <ReqT, RespT> void asyncUnaryRequestCall(
       ReqT param,
       ClientCall.Listener<RespT> responseListener) {
     call.start(responseListener, new Metadata.Headers());
-    call.request(1);
+    // Initially ask for two responses from flow-control so that if a misbehaving server sends more
+    // than one responses, we can catch it.
+    call.request(2);
     try {
       call.sendPayload(param);
       call.halfClose();
@@ -182,7 +184,9 @@ private static <ReqT, RespT> StreamObserver<ReqT> asyncStreamingRequestCall(
       boolean streamingResponse) {
     call.start(new StreamObserverToCallListenerAdapter<RespT>(
         call, responseObserver, streamingResponse), new Metadata.Headers());
-    call.request(1);
+    // Initially ask for two responses from flow-control so that if a misbehaving server sends more
+    // than one responses, we can catch it.
+    call.request(2);
     return new CallToStreamObserverAdapter<ReqT>(call);
   }
 
@@ -215,6 +219,7 @@ private static class StreamObserverToCallListenerAdapter<RespT>
     private final ClientCall<?, RespT> call;
     private final StreamObserver<RespT> observer;
     private final boolean streamingResponse;
+    private boolean firstResponseReceived;
 
     public StreamObserverToCallListenerAdapter(
         ClientCall<?, RespT> call, StreamObserver<RespT> observer, boolean streamingResponse) {
@@ -229,6 +234,12 @@ public void onHeaders(Metadata.Headers headers) {
 
     @Override
     public void onPayload(RespT payload) {
+      if (firstResponseReceived && !streamingResponse) {
+        throw Status.INTERNAL
+            .withDescription("More than one responses received for unary or client-streaming call")
+            .asRuntimeException();
+      }
+      firstResponseReceived = true;
       observer.onValue(payload);
 
       if (streamingResponse) {