QPID-6125 : ignore headers and bodies when the channel is closed

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1633082 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 8 insertions, 2 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
index 4d9826d83c..5c322f3845 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
@@ -85,7 +85,10 @@ public class ContentBody implements AMQBody
         byte[] payload = new byte[(int)bodySize];
         in.readFully(payload);
 
-        methodProcessor.receiveMessageContent(payload);
+        if(!methodProcessor.ignoreAllButCloseOk())
+        {
+            methodProcessor.receiveMessageContent(payload);
+        }
     }
 
     private static class BufferContentBody implements AMQBody
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
index 0d25e4dfba..377d2e115c 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
@@ -174,6 +174,9 @@ public class ContentHeaderBody implements AMQBody
         properties = new BasicContentHeaderProperties();
         properties.populatePropertiesFromBuffer(buffer, propertyFlags, (int)(size-14));
 
-        methodProcessor.receiveMessageHeader(properties, bodySize);
+        if(!methodProcessor.ignoreAllButCloseOk())
+        {
+            methodProcessor.receiveMessageHeader(properties, bodySize);
+        }
     }
 }