diff options
Diffstat (limited to 'qpid/java/amqp-1-0-client')
| -rw-r--r-- | qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java | 10 | ||||
| -rw-r--r-- | qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java index 212342cd96..c4f9783c89 100644 --- a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java +++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Message.java @@ -117,7 +117,12 @@ public class Message public Message(Collection<Section> sections) { - _payload.addAll(validateOrReorder(sections)); + this(sections, true); + } + + public Message(Collection<Section> sections, boolean validate) + { + _payload.addAll(validate ? validateOrReorder(sections) : sections); } public Message(Section section) @@ -214,7 +219,8 @@ public class Message while(it.hasNext()) { Collection<Class<? extends Section>> validSections = VALID_NEXT_SECTIONS.get(previousSection); - Class<? extends Section> sectionClass = it.next().getClass(); + Section next = it.next(); + Class<? extends Section> sectionClass = next.getClass(); if(validSections == null || !validSections.contains(sectionClass)) { return false; diff --git a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java index 1d9ec0fc66..be43601e63 100644 --- a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java +++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Receiver.java @@ -318,7 +318,7 @@ public class Receiver implements DeliveryStateHandler // todo - throw a sensible error e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. } - m = new Message(sections); + m = new Message(sections, false); m.setDeliveryTag(deliveryTag); m.setResume(resume); m.setReceiver(this); |