Author: rgodfrey
Date: Mon Oct 20 09:04:40 2014
New Revision: 1633082
URL: http://svn.apache.org/r1633082
Log:
QPID-6125 : ignore headers and bodies when the channel is closed
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java?rev=1633082&r1=1633081&r2=1633082&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
Mon Oct 20 09:04:40 2014
@@ -85,7 +85,10 @@ public class ContentBody implements AMQB
byte[] payload = new byte[(int)bodySize];
in.readFully(payload);
- methodProcessor.receiveMessageContent(payload);
+ if(!methodProcessor.ignoreAllButCloseOk())
+ {
+ methodProcessor.receiveMessageContent(payload);
+ }
}
private static class BufferContentBody implements AMQBody
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java?rev=1633082&r1=1633081&r2=1633082&view=diff
==============================================================================
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
Mon Oct 20 09:04:40 2014
@@ -174,6 +174,9 @@ public class ContentHeaderBody implement
properties = new BasicContentHeaderProperties();
properties.populatePropertiesFromBuffer(buffer, propertyFlags,
(int)(size-14));
- methodProcessor.receiveMessageHeader(properties, bodySize);
+ if(!methodProcessor.ignoreAllButCloseOk())
+ {
+ methodProcessor.receiveMessageHeader(properties, bodySize);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
