qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lqu...@apache.org
Subject [2/2] qpid-broker-j git commit: QPID-7777: [Java Broker] In AMQP 1.0 MessageMetaData#clearEncodedForm now clears the encoded forms of the sections instead of disposing them
Date Fri, 12 May 2017 10:48:27 GMT
QPID-7777: [Java Broker] In AMQP 1.0 MessageMetaData#clearEncodedForm now clears the encoded forms of the sections instead of disposing them


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/dc7dca5f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/dc7dca5f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/dc7dca5f

Branch: refs/heads/master
Commit: dc7dca5f8aba2bff92e5027c8992aba7198b50c4
Parents: f18fe94
Author: Lorenz Quack <lquack@apache.org>
Authored: Fri May 12 11:34:01 2017 +0100
Committer: Lorenz Quack <lquack@apache.org>
Committed: Fri May 12 11:34:01 2017 +0100

----------------------------------------------------------------------
 .../protocol/v1_0/ConsumerTarget_1_0.java       |  2 +-
 .../v1_0/MessageConverter_Internal_to_v1_0.java |  8 +--
 .../protocol/v1_0/MessageConverter_to_1_0.java  |  2 +-
 .../protocol/v1_0/MessageMetaData_1_0.java      | 25 +++++++-
 .../v1_0/type/messaging/AbstractSection.java    | 60 +++++++++++++++-----
 .../v1_0/type/messaging/AmqpSequence.java       |  6 +-
 .../type/messaging/AmqpSequenceSection.java     | 10 ++--
 .../protocol/v1_0/type/messaging/AmqpValue.java |  6 +-
 .../v1_0/type/messaging/AmqpValueSection.java   | 10 ++--
 .../type/messaging/ApplicationProperties.java   |  6 +-
 .../messaging/ApplicationPropertiesSection.java | 10 ++--
 .../protocol/v1_0/type/messaging/Data.java      |  5 +-
 .../v1_0/type/messaging/DataSection.java        | 10 ++--
 .../type/messaging/DeliveryAnnotations.java     |  5 +-
 .../messaging/DeliveryAnnotationsSection.java   | 10 ++--
 .../protocol/v1_0/type/messaging/Footer.java    |  5 +-
 .../v1_0/type/messaging/FooterSection.java      | 10 ++--
 .../protocol/v1_0/type/messaging/Header.java    |  5 +-
 .../v1_0/type/messaging/HeaderSection.java      | 10 ++--
 .../v1_0/type/messaging/MessageAnnotations.java |  5 +-
 .../messaging/MessageAnnotationsSection.java    | 10 ++--
 .../messaging/NonEncodingRetainingSection.java  |  3 +-
 .../v1_0/type/messaging/Properties.java         |  7 +--
 .../v1_0/type/messaging/PropertiesSection.java  | 11 ++--
 .../codec/AmqpSequenceSectionConstructor.java   |  4 +-
 .../codec/AmqpValueSectionConstructor.java      |  4 +-
 ...ApplicationPropertiesSectionConstructor.java |  2 +-
 .../messaging/codec/DataSectionConstructor.java |  3 +-
 .../DeliveryAnnotationsSectionConstructor.java  |  2 +-
 .../codec/DescribedListSectionConstructor.java  |  6 +-
 .../type/messaging/codec/EncodingRetaining.java | 11 ++--
 .../codec/FooterSectionConstructor.java         |  2 +-
 .../codec/HeaderSectionConstructor.java         |  4 +-
 .../MessageAnnotationsSectionConstructor.java   |  2 +-
 .../codec/PropertiesSectionConstructor.java     |  4 +-
 .../MessageConverter_0_10_to_1_0.java           |  6 +-
 .../v0_8_v1_0/MessageConverter_0_8_to_1_0.java  |  6 +-
 .../tests/protocol/v1_0/MessageEncoder.java     |  2 +-
 38 files changed, 158 insertions(+), 141 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
index a016a75..e806874 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConsumerTarget_1_0.java
@@ -147,7 +147,7 @@ class ConsumerTarget_1_0 extends AbstractConsumerTarget<ConsumerTarget_1_0>
                 header.setDeliveryCount(UnsignedInteger.valueOf(entry.getDeliveryCount()));
 
                 QpidByteBuffer headerPayload = _sectionEncoder.encodeObject(header);
-                headerSection = new HeaderSection(_typeRegistry);
+                headerSection = new HeaderSection();
                 headerSection.setEncodedForm(Collections.singletonList(headerPayload));
                 headerPayload.dispose();
             }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
index 602e075..57fca30 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_Internal_to_v1_0.java
@@ -90,11 +90,11 @@ public class MessageConverter_Internal_to_v1_0 extends MessageConverter_to_1_0<I
             applicationProperties = new ApplicationProperties(serverMessage.getMessageHeader().getHeaderMap() );
         }
 
-        return new MessageMetaData_1_0(header.createEncodingRetainingSection(sectionEncoder),
+        return new MessageMetaData_1_0(header.createEncodingRetainingSection(),
                                        null,
                                        null,
-                                       properties.createEncodingRetainingSection(sectionEncoder),
-                                       applicationProperties == null ? null : applicationProperties.createEncodingRetainingSection(sectionEncoder),
+                                       properties.createEncodingRetainingSection(),
+                                       applicationProperties == null ? null : applicationProperties.createEncodingRetainingSection(),
                                        null,
                                        serverMessage.getArrivalTime(),
                                        bodySection.getEncodedSize());
@@ -104,7 +104,7 @@ public class MessageConverter_Internal_to_v1_0 extends MessageConverter_to_1_0<I
     protected EncodingRetainingSection<?> getBodySection(final InternalMessage serverMessage,
                                                          final SectionEncoder encoder)
     {
-        return convertToBody(serverMessage.getMessageBody()).createEncodingRetainingSection(encoder);
+        return convertToBody(serverMessage.getMessageBody()).createEncodingRetainingSection();
     }
 
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
index e2fde5a..53fb71d 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_to_1_0.java
@@ -185,7 +185,7 @@ public abstract class MessageConverter_to_1_0<M extends ServerMessage> implement
             data = uncompressed;
         }
 
-        return convertMessageBody(mimeType, data).createEncodingRetainingSection(encoder);
+        return convertMessageBody(mimeType, data).createEncodingRetainingSection();
     }
 
     private static class ConvertedMessage<M extends ServerMessage> implements StoredMessage<MessageMetaData_1_0>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
index eed785d..a599b2a 100755
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
@@ -337,7 +337,30 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
     @Override
     public void clearEncodedForm()
     {
-        dispose();
+        if (_headerSection != null)
+        {
+            _headerSection.clearEncodedForm();
+        }
+        if (_deliveryAnnotationsSection != null)
+        {
+            _deliveryAnnotationsSection.clearEncodedForm();
+        }
+        if (_messageAnnotationsSection != null)
+        {
+            _messageAnnotationsSection.clearEncodedForm();
+        }
+        if (_propertiesSection != null)
+        {
+            _propertiesSection.clearEncodedForm();
+        }
+        if (_applicationPropertiesSection != null)
+        {
+            _applicationPropertiesSection.clearEncodedForm();
+        }
+        if (_footerSection != null)
+        {
+            _footerSection.clearEncodedForm();
+        }
     }
 
     public HeaderSection getHeaderSection()

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AbstractSection.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AbstractSection.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AbstractSection.java
index 8eb46e0..4eb4730 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AbstractSection.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AbstractSection.java
@@ -26,35 +26,41 @@ import java.util.List;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
 import org.apache.qpid.server.protocol.v1_0.codec.QpidByteBufferUtils;
 import org.apache.qpid.server.protocol.v1_0.codec.ValueHandler;
 import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
+import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoderImpl;
 import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
+import org.apache.qpid.server.protocol.v1_0.type.codec.AMQPDescribedTypeRegistry;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
 
 public abstract class AbstractSection<T, S extends NonEncodingRetainingSection<T>> implements EncodingRetainingSection<T>
 {
-    private final DescribedTypeConstructorRegistry _typeRegistry;
+    private static final AMQPDescribedTypeRegistry TYPE_REGISTRY = AMQPDescribedTypeRegistry.newInstance()
+                                                                                            .registerTransportLayer()
+                                                                                            .registerMessagingLayer()
+                                                                                            .registerTransactionLayer()
+                                                                                            .registerSecurityLayer();
+
     private T _value;
+    private S _section;
     private List<QpidByteBuffer> _encodedForm;
 
-    protected AbstractSection(final DescribedTypeConstructorRegistry registry)
+    protected AbstractSection()
     {
-        _typeRegistry = registry;
     }
 
-    protected AbstractSection(final S section, final SectionEncoder encoder)
+    protected AbstractSection(final S section)
     {
         _value = section.getValue();
-        _typeRegistry = encoder.getRegistry();
-        _encodedForm = Collections.singletonList(encoder.encodeObject(section));
+        _section = section;
+        _encodedForm = encode();
     }
 
     protected AbstractSection(final AbstractSection<T, S> otherAbstractSection)
     {
         _value = otherAbstractSection.getValue();
-        _typeRegistry = otherAbstractSection._typeRegistry;
+        _section = otherAbstractSection._section;
         _encodedForm = otherAbstractSection.getEncodedForm();
     }
 
@@ -72,6 +78,7 @@ public abstract class AbstractSection<T, S extends NonEncodingRetainingSection<T
     @Override
     public synchronized final void setEncodedForm(final List<QpidByteBuffer> encodedForm)
     {
+        clearEncodedForm();
         _encodedForm = new ArrayList<>();
         for(QpidByteBuffer encodedChunk : encodedForm)
         {
@@ -82,6 +89,10 @@ public abstract class AbstractSection<T, S extends NonEncodingRetainingSection<T
     @Override
     public synchronized final List<QpidByteBuffer> getEncodedForm()
     {
+        if (_encodedForm == null)
+        {
+            _encodedForm = encode();
+        }
         List<QpidByteBuffer> returnVal = new ArrayList<>(_encodedForm.size());
         for(int i = 0; i < _encodedForm.size(); i++)
         {
@@ -91,14 +102,23 @@ public abstract class AbstractSection<T, S extends NonEncodingRetainingSection<T
     }
 
     @Override
-    public synchronized final void dispose()
+    public synchronized void clearEncodedForm()
     {
-        for(int i = 0; i < _encodedForm.size(); i++)
+        if (_encodedForm != null)
         {
-            _encodedForm.get(i).dispose();
+            _section = decode(createNonEncodingRetainingSectionConstructor());
+            for (int i = 0; i < _encodedForm.size(); i++)
+            {
+                _encodedForm.get(i).dispose();
+            }
+            _encodedForm = null;
         }
-        _encodedForm = null;
+    }
 
+    @Override
+    public synchronized final void dispose()
+    {
+        clearEncodedForm();
     }
 
     @Override
@@ -110,12 +130,20 @@ public abstract class AbstractSection<T, S extends NonEncodingRetainingSection<T
     @Override
     public synchronized final long getEncodedSize()
     {
+        if (_encodedForm == null)
+        {
+            _encodedForm = encode();
+        }
         return QpidByteBufferUtils.remaining(_encodedForm);
     }
 
     @Override
     public synchronized void writeTo(final QpidByteBuffer dest)
     {
+        if (_encodedForm == null)
+        {
+            _encodedForm = encode();
+        }
         for(QpidByteBuffer buf : _encodedForm)
         {
             dest.putCopyOf(buf);
@@ -130,6 +158,12 @@ public abstract class AbstractSection<T, S extends NonEncodingRetainingSection<T
 
     protected abstract AbstractDescribedTypeConstructor<S> createNonEncodingRetainingSectionConstructor();
 
+    private List<QpidByteBuffer> encode()
+    {
+        SectionEncoder sectionEncoder = new SectionEncoderImpl(TYPE_REGISTRY);
+        return Collections.singletonList(sectionEncoder.encodeObject(_section));
+    }
+
     private S decode(AbstractDescribedTypeConstructor<S> constructor)
     {
         List<QpidByteBuffer> input = getEncodedForm();
@@ -139,7 +173,7 @@ public abstract class AbstractSection<T, S extends NonEncodingRetainingSection<T
             originalPositions[i] = input.get(i).position();
         }
         int describedByte = QpidByteBufferUtils.get(input);
-        ValueHandler handler = new ValueHandler(_typeRegistry);
+        ValueHandler handler = new ValueHandler(TYPE_REGISTRY);
         try
         {
             Object descriptor = handler.parse(input);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequence.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequence.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequence.java
index da5a860..dbf2888 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequence.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequence.java
@@ -25,8 +25,6 @@ package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 import java.util.List;
 
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
-
 public class AmqpSequence implements NonEncodingRetainingSection<List>
 {
 
@@ -50,8 +48,8 @@ public class AmqpSequence implements NonEncodingRetainingSection<List>
     }
 
     @Override
-    public AmqpSequenceSection createEncodingRetainingSection(final SectionEncoder encoder)
+    public AmqpSequenceSection createEncodingRetainingSection()
     {
-        return new AmqpSequenceSection(this, encoder);
+        return new AmqpSequenceSection(this);
     }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequenceSection.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequenceSection.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequenceSection.java
index 79df8e8..131ddb9 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequenceSection.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpSequenceSection.java
@@ -24,20 +24,18 @@ package org.apache.qpid.server.protocol.v1_0.type.messaging;
 import java.util.List;
 
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.messaging.codec.AmqpSequenceConstructor;
 
 public class AmqpSequenceSection extends AbstractSection<List, AmqpSequence>
 {
-    public AmqpSequenceSection(final DescribedTypeConstructorRegistry describedTypeRegistry)
+    public AmqpSequenceSection()
     {
-        super(describedTypeRegistry);
+        super();
     }
 
-    AmqpSequenceSection(final AmqpSequence sequence, final SectionEncoder sectionEncoder)
+    AmqpSequenceSection(final AmqpSequence sequence)
     {
-        super(sequence, sectionEncoder);
+        super(sequence);
     }
 
     AmqpSequenceSection(final AmqpSequenceSection amqpSequenceSection)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValue.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValue.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValue.java
index 09b77c6..26a83e1 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValue.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValue.java
@@ -24,8 +24,6 @@
 package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
-
 public class AmqpValue implements NonEncodingRetainingSection<Object>
 {
 
@@ -52,8 +50,8 @@ public class AmqpValue implements NonEncodingRetainingSection<Object>
 
 
     @Override
-    public AmqpValueSection createEncodingRetainingSection(final SectionEncoder encoder)
+    public AmqpValueSection createEncodingRetainingSection()
     {
-        return new AmqpValueSection(this, encoder);
+        return new AmqpValueSection(this);
     }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValueSection.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValueSection.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValueSection.java
index 40ea3e1..6450243 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValueSection.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/AmqpValueSection.java
@@ -22,20 +22,18 @@
 package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.messaging.codec.AmqpValueConstructor;
 
 public class AmqpValueSection extends AbstractSection<Object, AmqpValue>
 {
-    public AmqpValueSection(final DescribedTypeConstructorRegistry describedTypeRegistry)
+    public AmqpValueSection()
     {
-        super(describedTypeRegistry);
+        super();
     }
 
-    AmqpValueSection(final AmqpValue amqpValue, SectionEncoder sectionEncoder)
+    AmqpValueSection(final AmqpValue amqpValue)
     {
-        super(amqpValue, sectionEncoder);
+        super(amqpValue);
     }
 
     AmqpValueSection(final AmqpValueSection amqpValueSection)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationProperties.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationProperties.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationProperties.java
index bd63785..b8449b6 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationProperties.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationProperties.java
@@ -25,8 +25,6 @@ package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 import java.util.Map;
 
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
-
 public class ApplicationProperties implements NonEncodingRetainingSection<Map<String,Object>>
 {
 
@@ -43,8 +41,8 @@ public class ApplicationProperties implements NonEncodingRetainingSection<Map<St
     }
 
     @Override
-    public ApplicationPropertiesSection createEncodingRetainingSection(final SectionEncoder encoder)
+    public ApplicationPropertiesSection createEncodingRetainingSection()
     {
-        return new ApplicationPropertiesSection(this, encoder);
+        return new ApplicationPropertiesSection(this);
     }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationPropertiesSection.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationPropertiesSection.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationPropertiesSection.java
index 2c9ca92..459a5a3 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationPropertiesSection.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/ApplicationPropertiesSection.java
@@ -24,21 +24,19 @@ package org.apache.qpid.server.protocol.v1_0.type.messaging;
 import java.util.Map;
 
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.messaging.codec.ApplicationPropertiesConstructor;
 
 public class ApplicationPropertiesSection extends AbstractSection<Map<String,Object>, ApplicationProperties>
 {
 
-    public ApplicationPropertiesSection(final DescribedTypeConstructorRegistry registry)
+    public ApplicationPropertiesSection()
     {
-        super(registry);
+        super();
     }
 
-    ApplicationPropertiesSection(final ApplicationProperties section, final SectionEncoder encoder)
+    ApplicationPropertiesSection(final ApplicationProperties section)
     {
-        super(section, encoder);
+        super(section);
     }
 
     ApplicationPropertiesSection(final ApplicationPropertiesSection applicationPropertiesSection)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Data.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Data.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Data.java
index 9a10fa3..9352064 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Data.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Data.java
@@ -21,7 +21,6 @@
 
 package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.Binary;
 
 public class Data implements NonEncodingRetainingSection<Binary>
@@ -47,8 +46,8 @@ public class Data implements NonEncodingRetainingSection<Binary>
     }
 
     @Override
-    public DataSection createEncodingRetainingSection(final SectionEncoder encoder)
+    public DataSection createEncodingRetainingSection()
     {
-        return new DataSection(this, encoder);
+        return new DataSection(this);
     }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DataSection.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DataSection.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DataSection.java
index d10f90a..ef93dfa 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DataSection.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DataSection.java
@@ -22,21 +22,19 @@
 package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.Binary;
 import org.apache.qpid.server.protocol.v1_0.type.messaging.codec.DataConstructor;
 
 public class DataSection extends AbstractSection<Binary, Data>
 {
-    public DataSection(final DescribedTypeConstructorRegistry describedTypeRegistry)
+    public DataSection()
     {
-        super(describedTypeRegistry);
+        super();
     }
 
-    DataSection(final Data data, SectionEncoder sectionEncoder)
+    DataSection(final Data data)
     {
-        super(data, sectionEncoder);
+        super(data);
     }
 
     DataSection(final DataSection dataSection)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotations.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotations.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotations.java
index 8a65b3f..60068cb 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotations.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotations.java
@@ -23,7 +23,6 @@ package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 import java.util.Map;
 
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.Symbol;
 
 public class DeliveryAnnotations implements NonEncodingRetainingSection<Map<Symbol,Object>>
@@ -42,8 +41,8 @@ public class DeliveryAnnotations implements NonEncodingRetainingSection<Map<Symb
     }
 
     @Override
-    public DeliveryAnnotationsSection createEncodingRetainingSection(final SectionEncoder encoder)
+    public DeliveryAnnotationsSection createEncodingRetainingSection()
     {
-        return new DeliveryAnnotationsSection(this, encoder);
+        return new DeliveryAnnotationsSection(this);
     }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotationsSection.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotationsSection.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotationsSection.java
index 3c4b550..ee5e75b 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotationsSection.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/DeliveryAnnotationsSection.java
@@ -24,21 +24,19 @@ package org.apache.qpid.server.protocol.v1_0.type.messaging;
 import java.util.Map;
 
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.Symbol;
 import org.apache.qpid.server.protocol.v1_0.type.messaging.codec.DeliveryAnnotationsConstructor;
 
 public class DeliveryAnnotationsSection extends AbstractSection<Map<Symbol,Object>, DeliveryAnnotations>
 {
-    public DeliveryAnnotationsSection(final DescribedTypeConstructorRegistry describedTypeRegistry)
+    public DeliveryAnnotationsSection()
     {
-        super(describedTypeRegistry);
+        super();
     }
 
-    DeliveryAnnotationsSection(final DeliveryAnnotations deliveryAnnotations, final SectionEncoder sectionEncoder)
+    DeliveryAnnotationsSection(final DeliveryAnnotations deliveryAnnotations)
     {
-        super(deliveryAnnotations, sectionEncoder);
+        super(deliveryAnnotations);
     }
 
     DeliveryAnnotationsSection(final DeliveryAnnotationsSection deliveryAnnotationsSection)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Footer.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Footer.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Footer.java
index fd89a03..d6657fc 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Footer.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Footer.java
@@ -23,7 +23,6 @@ package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 import java.util.Map;
 
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.Symbol;
 
 public class Footer implements NonEncodingRetainingSection<Map<Symbol,Object>>
@@ -49,8 +48,8 @@ public class Footer implements NonEncodingRetainingSection<Map<Symbol,Object>>
     }
 
     @Override
-    public FooterSection createEncodingRetainingSection(final SectionEncoder encoder)
+    public FooterSection createEncodingRetainingSection()
     {
-        return new FooterSection(this, encoder);
+        return new FooterSection(this);
     }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/FooterSection.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/FooterSection.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/FooterSection.java
index b41de4b..7e089de 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/FooterSection.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/FooterSection.java
@@ -24,21 +24,19 @@ package org.apache.qpid.server.protocol.v1_0.type.messaging;
 import java.util.Map;
 
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.Symbol;
 import org.apache.qpid.server.protocol.v1_0.type.messaging.codec.FooterConstructor;
 
 public class FooterSection extends AbstractSection<Map<Symbol,Object>, Footer>
 {
-    public FooterSection(final DescribedTypeConstructorRegistry describedTypeRegistry)
+    public FooterSection()
     {
-        super(describedTypeRegistry);
+        super();
     }
 
-    FooterSection(final Footer footer, final SectionEncoder sectionEncoder)
+    FooterSection(final Footer footer)
     {
-        super(footer, sectionEncoder);
+        super(footer);
     }
 
     FooterSection(final FooterSection footerSection)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Header.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Header.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Header.java
index 87d92b9..93eaf5a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Header.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Header.java
@@ -24,7 +24,6 @@
 package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.CompositeTypeField;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedByte;
 import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
@@ -159,8 +158,8 @@ public class Header implements NonEncodingRetainingSection<Header>
     }
 
     @Override
-    public HeaderSection createEncodingRetainingSection(final SectionEncoder encoder)
+    public HeaderSection createEncodingRetainingSection()
     {
-        return new HeaderSection(this, encoder);
+        return new HeaderSection(this);
     }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/HeaderSection.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/HeaderSection.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/HeaderSection.java
index 9ffab93..4ea985b 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/HeaderSection.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/HeaderSection.java
@@ -22,20 +22,18 @@
 package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.messaging.codec.HeaderConstructor;
 
 public class HeaderSection extends AbstractSection<Header, Header>
 {
-    public HeaderSection(final DescribedTypeConstructorRegistry describedTypeRegistry)
+    public HeaderSection()
     {
-        super(describedTypeRegistry);
+        super();
     }
 
-    HeaderSection(final Header header, final SectionEncoder sectionEncoder)
+    HeaderSection(final Header header)
     {
-        super(header, sectionEncoder);
+        super(header);
     }
 
     HeaderSection(final HeaderSection headerSection)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotations.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotations.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotations.java
index 7481ebf..e2c1843 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotations.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotations.java
@@ -23,7 +23,6 @@ package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 import java.util.Map;
 
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.Symbol;
 
 public class MessageAnnotations implements NonEncodingRetainingSection<Map<Symbol,Object>>
@@ -42,8 +41,8 @@ public class MessageAnnotations implements NonEncodingRetainingSection<Map<Symbo
     }
 
     @Override
-    public MessageAnnotationsSection createEncodingRetainingSection(final SectionEncoder encoder)
+    public MessageAnnotationsSection createEncodingRetainingSection()
     {
-        return new MessageAnnotationsSection(this, encoder);
+        return new MessageAnnotationsSection(this);
     }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotationsSection.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotationsSection.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotationsSection.java
index 6719787..40f3743 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotationsSection.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/MessageAnnotationsSection.java
@@ -24,21 +24,19 @@ package org.apache.qpid.server.protocol.v1_0.type.messaging;
 import java.util.Map;
 
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.Symbol;
 import org.apache.qpid.server.protocol.v1_0.type.messaging.codec.MessageAnnotationsConstructor;
 
 public class MessageAnnotationsSection extends AbstractSection<Map<Symbol,Object>, MessageAnnotations>
 {
-    public MessageAnnotationsSection(DescribedTypeConstructorRegistry registry)
+    public MessageAnnotationsSection()
     {
-        super(registry);
+        super();
     }
 
-    MessageAnnotationsSection(final MessageAnnotations messageAnnotations, final SectionEncoder sectionEncoder)
+    MessageAnnotationsSection(final MessageAnnotations messageAnnotations)
     {
-        super(messageAnnotations, sectionEncoder);
+        super(messageAnnotations);
     }
 
     MessageAnnotationsSection(final MessageAnnotationsSection messageAnnotationsSection)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/NonEncodingRetainingSection.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/NonEncodingRetainingSection.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/NonEncodingRetainingSection.java
index 1b3b7eb..fc9a43d 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/NonEncodingRetainingSection.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/NonEncodingRetainingSection.java
@@ -20,10 +20,9 @@
  */
 package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.Section;
 
 public interface NonEncodingRetainingSection<T> extends Section<T>
 {
-    EncodingRetainingSection<T> createEncodingRetainingSection(SectionEncoder encoder);
+    EncodingRetainingSection<T> createEncodingRetainingSection();
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Properties.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Properties.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Properties.java
index fefcf18..2b5ae60 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Properties.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/Properties.java
@@ -21,11 +21,8 @@
 
 package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
-import java.util.Collections;
 import java.util.Date;
 
-import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.Binary;
 import org.apache.qpid.server.protocol.v1_0.type.CompositeTypeField;
 import org.apache.qpid.server.protocol.v1_0.type.Symbol;
@@ -336,8 +333,8 @@ public class Properties implements NonEncodingRetainingSection<Properties>
     }
 
     @Override
-    public PropertiesSection createEncodingRetainingSection(final SectionEncoder encoder)
+    public PropertiesSection createEncodingRetainingSection()
     {
-        return new PropertiesSection(this, encoder);
+        return new PropertiesSection(this);
     }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/PropertiesSection.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/PropertiesSection.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/PropertiesSection.java
index bf58f1b..f9d80b6 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/PropertiesSection.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/PropertiesSection.java
@@ -22,21 +22,18 @@
 package org.apache.qpid.server.protocol.v1_0.type.messaging;
 
 import org.apache.qpid.server.protocol.v1_0.codec.AbstractDescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
-import org.apache.qpid.server.protocol.v1_0.messaging.SectionEncoder;
 import org.apache.qpid.server.protocol.v1_0.type.messaging.codec.PropertiesConstructor;
 
 public class PropertiesSection extends AbstractSection<Properties, Properties>
 {
-    public PropertiesSection(final DescribedTypeConstructorRegistry describedTypeRegistry)
+    public PropertiesSection()
     {
-        super(describedTypeRegistry);
+        super();
     }
 
-    PropertiesSection(final Properties properties,
-                             final SectionEncoder sectionEncoder)
+    PropertiesSection(final Properties properties)
     {
-       super(properties, sectionEncoder);
+       super(properties);
     }
 
     PropertiesSection(final PropertiesSection propertiesSection)

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceSectionConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceSectionConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceSectionConstructor.java
index 1d26a07..462a31e 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceSectionConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpSequenceSectionConstructor.java
@@ -46,9 +46,9 @@ public class AmqpSequenceSectionConstructor extends DescribedListSectionConstruc
     }
 
     @Override
-    protected AmqpSequenceSection createObject(final DescribedTypeConstructorRegistry describedTypeRegistry)
+    protected AmqpSequenceSection createObject()
     {
-        return new AmqpSequenceSection(describedTypeRegistry);
+        return new AmqpSequenceSection();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueSectionConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueSectionConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueSectionConstructor.java
index 0d51fa6..a29144c 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueSectionConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/AmqpValueSectionConstructor.java
@@ -30,7 +30,6 @@ import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
 import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
 import org.apache.qpid.server.protocol.v1_0.codec.QpidByteBufferUtils;
-import org.apache.qpid.server.protocol.v1_0.codec.SectionDecoderRegistry;
 import org.apache.qpid.server.protocol.v1_0.codec.TypeConstructor;
 import org.apache.qpid.server.protocol.v1_0.codec.ValueHandler;
 import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
@@ -106,8 +105,7 @@ public class AmqpValueSectionConstructor implements DescribedTypeConstructor<Amq
                     encoding.add(dup);
                 }
             }
-            AmqpValueSection object =
-                    new AmqpValueSection(((SectionDecoderRegistry) handler.getDescribedTypeRegistry()).getUnderlyingRegistry());
+            AmqpValueSection object = new AmqpValueSection();
             object.setEncodedForm(encoding);
             for (QpidByteBuffer buffer: encoding)
             {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesSectionConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesSectionConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesSectionConstructor.java
index e6cb27d..a018e12 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesSectionConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/ApplicationPropertiesSectionConstructor.java
@@ -48,7 +48,7 @@ public class ApplicationPropertiesSectionConstructor extends DescribedMapSection
     @Override
     protected ApplicationPropertiesSection createObject(final DescribedTypeConstructorRegistry describedTypeRegistry)
     {
-        return new ApplicationPropertiesSection(describedTypeRegistry);
+        return new ApplicationPropertiesSection();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataSectionConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataSectionConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataSectionConstructor.java
index c193cb0..23ba6a9 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataSectionConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DataSectionConstructor.java
@@ -30,7 +30,6 @@ import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
 import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
 import org.apache.qpid.server.protocol.v1_0.codec.QpidByteBufferUtils;
-import org.apache.qpid.server.protocol.v1_0.codec.SectionDecoderRegistry;
 import org.apache.qpid.server.protocol.v1_0.codec.TypeConstructor;
 import org.apache.qpid.server.protocol.v1_0.codec.ValueHandler;
 import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
@@ -137,7 +136,7 @@ public class DataSectionConstructor implements DescribedTypeConstructor<DataSect
                     encoding.add(dup);
                 }
             }
-            DataSection object = new DataSection(((SectionDecoderRegistry)handler.getDescribedTypeRegistry()).getUnderlyingRegistry());
+            DataSection object = new DataSection();
             object.setEncodedForm(encoding);
             for (QpidByteBuffer buffer: encoding)
             {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsSectionConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsSectionConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsSectionConstructor.java
index b4e522d..8633469 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsSectionConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DeliveryAnnotationsSectionConstructor.java
@@ -48,7 +48,7 @@ public class DeliveryAnnotationsSectionConstructor extends DescribedMapSectionCo
     @Override
     protected DeliveryAnnotationsSection createObject(final DescribedTypeConstructorRegistry describedTypeRegistry)
     {
-        return new DeliveryAnnotationsSection(describedTypeRegistry);
+        return new DeliveryAnnotationsSection();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedListSectionConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedListSectionConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedListSectionConstructor.java
index 9b83866..605c6d9 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedListSectionConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/DescribedListSectionConstructor.java
@@ -28,9 +28,7 @@ import java.util.List;
 
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructor;
-import org.apache.qpid.server.protocol.v1_0.codec.DescribedTypeConstructorRegistry;
 import org.apache.qpid.server.protocol.v1_0.codec.QpidByteBufferUtils;
-import org.apache.qpid.server.protocol.v1_0.codec.SectionDecoderRegistry;
 import org.apache.qpid.server.protocol.v1_0.codec.TypeConstructor;
 import org.apache.qpid.server.protocol.v1_0.codec.ValueHandler;
 import org.apache.qpid.server.protocol.v1_0.type.AmqpErrorException;
@@ -126,7 +124,7 @@ public abstract class DescribedListSectionConstructor<S extends AbstractSection>
                     encoding.add(dup);
                 }
             }
-            S object = createObject(((SectionDecoderRegistry)handler.getDescribedTypeRegistry()).getUnderlyingRegistry());
+            S object = createObject();
             object.setEncodedForm(encoding);
             for (QpidByteBuffer buffer: encoding)
             {
@@ -137,5 +135,5 @@ public abstract class DescribedListSectionConstructor<S extends AbstractSection>
         }
     }
 
-    protected abstract S createObject(final DescribedTypeConstructorRegistry describedTypeRegistry);
+    protected abstract S createObject();
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/EncodingRetaining.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/EncodingRetaining.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/EncodingRetaining.java
index f20b0ba..d98ddec 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/EncodingRetaining.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/EncodingRetaining.java
@@ -26,13 +26,12 @@ import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 
 public interface EncodingRetaining
 {
+    void writeTo(QpidByteBuffer dest);
+    long getEncodedSize();
     void setEncodedForm(List<QpidByteBuffer> encodedForm);
     List<QpidByteBuffer> getEncodedForm();
-    void dispose();
-    void reallocate();
-    long getEncodedSize();
-    void writeTo(QpidByteBuffer dest);
+    void clearEncodedForm();
     EncodingRetaining copy();
-
-
+    void reallocate();
+    void dispose();
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterSectionConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterSectionConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterSectionConstructor.java
index 531df9e..341d8ce 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterSectionConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/FooterSectionConstructor.java
@@ -48,7 +48,7 @@ public class FooterSectionConstructor extends DescribedMapSectionConstructor<Foo
     @Override
     protected FooterSection createObject(final DescribedTypeConstructorRegistry describedTypeRegistry)
     {
-        return new FooterSection(describedTypeRegistry);
+        return new FooterSection();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderSectionConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderSectionConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderSectionConstructor.java
index ad39b08..25fe80a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderSectionConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/HeaderSectionConstructor.java
@@ -46,9 +46,9 @@ public class HeaderSectionConstructor extends DescribedListSectionConstructor<He
     }
 
     @Override
-    protected HeaderSection createObject(final DescribedTypeConstructorRegistry describedTypeRegistry)
+    protected HeaderSection createObject()
     {
-        return new HeaderSection(describedTypeRegistry);
+        return new HeaderSection();
     }
 
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsSectionConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsSectionConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsSectionConstructor.java
index b3ae64c..5ea957f 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsSectionConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/MessageAnnotationsSectionConstructor.java
@@ -48,7 +48,7 @@ public class MessageAnnotationsSectionConstructor extends DescribedMapSectionCon
     @Override
     protected MessageAnnotationsSection createObject(final DescribedTypeConstructorRegistry describedTypeRegistry)
     {
-        return new MessageAnnotationsSection(describedTypeRegistry);
+        return new MessageAnnotationsSection();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesSectionConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesSectionConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesSectionConstructor.java
index cf6108c..57aceec 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesSectionConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/PropertiesSectionConstructor.java
@@ -46,9 +46,9 @@ public class PropertiesSectionConstructor extends DescribedListSectionConstructo
     }
 
     @Override
-    protected PropertiesSection createObject(final DescribedTypeConstructorRegistry describedTypeRegistry)
+    protected PropertiesSection createObject()
     {
-        return new PropertiesSection(describedTypeRegistry);
+        return new PropertiesSection();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java b/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
index 7e5cc7e..4e13258 100644
--- a/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
+++ b/broker-plugins/amqp-msg-conv-0-10-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_10_v1_0/MessageConverter_0_10_to_1_0.java
@@ -143,11 +143,11 @@ public class MessageConverter_0_10_to_1_0  extends MessageConverter_to_1_0<Messa
 
             }
         }
-        return new MessageMetaData_1_0(header.createEncodingRetainingSection(sectionEncoder),
+        return new MessageMetaData_1_0(header.createEncodingRetainingSection(),
                                        null,
                                        null,
-                                       props.createEncodingRetainingSection(sectionEncoder),
-                                       applicationProperties == null ? null : applicationProperties.createEncodingRetainingSection(sectionEncoder),
+                                       props.createEncodingRetainingSection(),
+                                       applicationProperties == null ? null : applicationProperties.createEncodingRetainingSection(),
                                        null,
                                        serverMessage.getArrivalTime(),
                                        bodySection.getEncodedSize());

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
index 1e1105a..d7528f8 100644
--- a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
+++ b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
@@ -167,11 +167,11 @@ public class MessageConverter_0_8_to_1_0 extends MessageConverter_to_1_0<AMQMess
         // 0-8..0-91 for instance supported field tables with maps as values.
         final ApplicationProperties applicationProperties = new ApplicationProperties(applicationPropertiesMap);
 
-        return new MessageMetaData_1_0(header.createEncodingRetainingSection(sectionEncoder),
+        return new MessageMetaData_1_0(header.createEncodingRetainingSection(),
                                        null,
                                        null,
-                                       props.createEncodingRetainingSection(sectionEncoder),
-                                       applicationProperties.createEncodingRetainingSection(sectionEncoder),
+                                       props.createEncodingRetainingSection(),
+                                       applicationProperties.createEncodingRetainingSection(),
                                        null,
                                        serverMessage.getArrivalTime(),
                                        bodySection.getEncodedSize());

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dc7dca5f/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/MessageEncoder.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/MessageEncoder.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/MessageEncoder.java
index 338fd7c..78ffe9d 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/MessageEncoder.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/MessageEncoder.java
@@ -57,7 +57,7 @@ public class MessageEncoder
         if (_data.size() == 1)
         {
             AmqpValue amqpValue = new AmqpValue(_data.get(0));
-            dataSections.add(amqpValue.createEncodingRetainingSection(_encoder));
+            dataSections.add(amqpValue.createEncodingRetainingSection());
         }
         else
         {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message