From d0e883ac209a238642b2030404ca6f81e82ad483 Mon Sep 17 00:00:00 2001
From: nmittler <nathanmittler@google.com>
Date: Fri, 30 Jan 2015 09:59:47 -0800
Subject: [PATCH] Fixing integration tests

Allowing MessageDeframer.request to be called after the deframer has
been closed.  The stub helpers blindly call request after receiving each
message.
---
 .../io/grpc/transport/MessageDeframer.java    | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/io/grpc/transport/MessageDeframer.java b/core/src/main/java/io/grpc/transport/MessageDeframer.java
index aeac989a33..0a4b961f85 100644
--- a/core/src/main/java/io/grpc/transport/MessageDeframer.java
+++ b/core/src/main/java/io/grpc/transport/MessageDeframer.java
@@ -127,19 +127,30 @@ public class MessageDeframer implements Closeable {
 
   /**
    * Requests up to the given number of messages from the call to be delivered to
-   * {@link Listener#messageRead(InputStream, int)}. No additional messages will be delivered.
+   * {@link Listener#messageRead(InputStream)}. No additional messages will be delivered.
+   *
+   * <p>If {@link #close()} has been called, this method will have no effect.
    *
    * @param numMessages the requested number of messages to be delivered to the listener.
    */
   public void request(int numMessages) {
-    checkNotClosed();
     Preconditions.checkArgument(numMessages > 0, "numMessages must be > 0");
+    if (isClosed()) {
+      return;
+    }
     pendingDeliveries += numMessages;
     deliver();
   }
 
   /**
    * Adds the given data to this deframer and attempts delivery to the sink.
+   *
+   * @param data the raw data read from the remote endpoint. Must be non-null.
+   * @param endOfStream if {@code true}, indicates that {@code data} is the end of the stream from
+   *        the remote endpoint.
+   * @throws IllegalStateException if {@link #close()} has been called previously or if
+   *         {@link #deframe(Buffer, boolean)} has previously been called with
+   *         {@code endOfStream=true}.
    */
   public void deframe(Buffer data, boolean endOfStream) {
     checkNotClosed();
@@ -178,11 +189,18 @@ public class MessageDeframer implements Closeable {
     }
   }
 
+  /**
+   * Indicates whether or not this deframer has been closed.
+   */
+  public boolean isClosed() {
+    return unprocessed == null;
+  }
+
   /**
    * Throws if this deframer has already been closed.
    */
   private void checkNotClosed() {
-    Preconditions.checkState(unprocessed != null, "MessageDeframer is already closed");
+    Preconditions.checkState(!isClosed(), "MessageDeframer is already closed");
   }
 
   /**