1 files changed, 8 insertions, 2 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;