Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java (from r1628074, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java&r1=1628074&r2=1628336&rev=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java Mon Sep 29 23:20:39 2014 @@ -25,29 +25,17 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +package org.apache.qpid.framing; import org.apache.qpid.codec.MarkableDataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; +import org.apache.qpid.framing.amqp_8_0.MethodDispatcher_8_0; -public class ChannelAlertBodyImpl extends AMQMethodBodyImpl implements ChannelAlertBody +public class ChannelAlertBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ChannelAlertBodyImpl(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 20; public static final int METHOD_ID = 30; @@ -58,18 +46,18 @@ public class ChannelAlertBodyImpl extend private final FieldTable _details; // [details] // Constructor - public ChannelAlertBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException + public ChannelAlertBody(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException { _replyCode = readUnsignedShort( buffer ); _replyText = readAMQShortString( buffer ); _details = readFieldTable( buffer ); } - public ChannelAlertBodyImpl( - int replyCode, - AMQShortString replyText, - FieldTable details - ) + public ChannelAlertBody( + int replyCode, + AMQShortString replyText, + FieldTable details + ) { _replyCode = replyCode; _replyText = replyText;
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ChannelCloseBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ChannelCloseBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 20; public static final int METHOD_ID = 40; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ChannelCloseOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ChannelCloseOkBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 20; public static final int METHOD_ID = 41; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ChannelFlowBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ChannelFlowBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 20; public static final int METHOD_ID = 20; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ChannelFlowOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ChannelFlowOkBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 20; public static final int METHOD_ID = 21; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ChannelOpenBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ChannelOpenBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 20; public static final int METHOD_ID = 10; Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java (from r1628074, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java&r1=1628074&r2=1628336&rev=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java Mon Sep 29 23:20:39 2014 @@ -25,43 +25,41 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +package org.apache.qpid.framing; -import org.apache.qpid.codec.MarkableDataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; +import org.apache.qpid.codec.MarkableDataInput; -public class ChannelOpenOkBodyImpl extends AMQMethodBodyImpl implements ChannelOpenOkBody +public class ChannelOpenOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ChannelOpenOkBodyImpl(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 20; public static final int METHOD_ID = 11; - // Fields declared in specification + public static final ChannelOpenOkBody INSTANCE_0_8 = new ChannelOpenOkBody(true); + public static final ChannelOpenOkBody INSTANCE_0_9 = new ChannelOpenOkBody(false); - // Constructor - public ChannelOpenOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException + public static ChannelOpenOkBody getInstance(ProtocolVersion protocolVersion, MarkableDataInput input) + throws IOException { + final boolean isAMQP08 = ProtocolVersion.v8_0.equals(protocolVersion); + ChannelOpenOkBody instance = isAMQP08 ? INSTANCE_0_8 : INSTANCE_0_9; + if(!isAMQP08) + { + EncodingUtils.readBytes(input); + } + return instance; } + // Fields declared in specification + private final boolean _isAMQP08; + // Constructor - public ChannelOpenOkBodyImpl( - ) + private ChannelOpenOkBody(boolean isAMQP08) { + _isAMQP08 = isAMQP08; } public int getClazz() @@ -77,24 +75,25 @@ public class ChannelOpenOkBodyImpl exten protected int getBodySize() { - int size = 0; - return size; + return _isAMQP08 ? 0 : 4; } public void writeMethodPayload(DataOutput buffer) throws IOException { + if(!_isAMQP08) + { + buffer.writeInt(0); + } } public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchChannelOpenOk(this, channelId); + return dispatcher.dispatchChannelOpenOk(this, channelId); } public String toString() { - StringBuilder buf = new StringBuilder("[ChannelOpenOkBodyImpl: "); - buf.append("]"); - return buf.toString(); + return "[ChannelOpenOkBody]"; } } Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java Mon Sep 29 23:20:39 2014 @@ -63,4 +63,11 @@ public interface ClientMethodDispatcher public boolean dispatchTxRollbackOk(TxRollbackOkBody body, int channelId) throws AMQException; public boolean dispatchTxSelectOk(TxSelectOkBody body, int channelId) throws AMQException; + boolean dispatchConnectionRedirect(ConnectionRedirectBody connectionRedirectBody, int channelId) throws AMQException; + boolean dispatchAccessRequestOk(AccessRequestOkBody accessRequestOkBody, int channelId) throws AMQException; + + boolean dispatchQueueUnbindOk(QueueUnbindOkBody queueUnbindOkBody, int channelId) throws AMQException; + + boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody basicRecoverSyncOkBody, int channelId) + throws AMQException; } Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java (from r1628074, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java&r1=1628074&r2=1628336&rev=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java Mon Sep 29 23:20:39 2014 @@ -25,33 +25,20 @@ * 0-91 */ -package org.apache.qpid.framing.amqp_0_91; +package org.apache.qpid.framing; -import org.apache.qpid.codec.MarkableDataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; +import org.apache.qpid.codec.MarkableDataInput; -public class ConnectionCloseBodyImpl extends AMQMethodBodyImpl implements ConnectionCloseBody +public class ConnectionCloseBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ConnectionCloseBodyImpl(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 10; - public static final int METHOD_ID = 50; + private final int _ownMethodId; // Fields declared in specification private final int _replyCode; // [replyCode] private final AMQShortString _replyText; // [replyText] @@ -59,21 +46,23 @@ public class ConnectionCloseBodyImpl ext private final int _methodId; // [methodId] // Constructor - public ConnectionCloseBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException + public ConnectionCloseBody(MarkableDataInput buffer, ProtocolVersion protocolVersion) throws AMQFrameDecodingException, IOException { + _ownMethodId = ProtocolVersion.v8_0.equals(protocolVersion) ? 60 : 50; _replyCode = readUnsignedShort( buffer ); _replyText = readAMQShortString( buffer ); _classId = readUnsignedShort( buffer ); _methodId = readUnsignedShort( buffer ); } - public ConnectionCloseBodyImpl( - int replyCode, - AMQShortString replyText, - int classId, - int methodId - ) + public ConnectionCloseBody(ProtocolVersion protocolVersion, + int replyCode, + AMQShortString replyText, + int classId, + int methodId + ) { + _ownMethodId = ProtocolVersion.v8_0.equals(protocolVersion) ? 60 : 50; _replyCode = replyCode; _replyText = replyText; _classId = classId; @@ -87,7 +76,7 @@ public class ConnectionCloseBodyImpl ext public int getMethod() { - return METHOD_ID; + return _ownMethodId; } public final int getReplyCode() @@ -124,7 +113,7 @@ public class ConnectionCloseBodyImpl ext public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_0_91)dispatcher).dispatchConnectionClose(this, channelId); + return dispatcher.dispatchConnectionClose(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java (from r1628074, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java&r1=1628074&r2=1628336&rev=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java Mon Sep 29 23:20:39 2014 @@ -25,44 +25,29 @@ * 0-91 */ -package org.apache.qpid.framing.amqp_0_91; +package org.apache.qpid.framing; -import org.apache.qpid.codec.MarkableDataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; +import org.apache.qpid.codec.MarkableDataInput; -public class ConnectionCloseOkBodyImpl extends AMQMethodBodyImpl implements ConnectionCloseOkBody +public class ConnectionCloseOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ConnectionCloseOkBodyImpl(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } + private final int _ownMethodId; public static final int CLASS_ID = 10; - public static final int METHOD_ID = 51; - // Fields declared in specification + public static final ConnectionCloseOkBody CONNECTION_CLOSE_OK_0_8 = new ConnectionCloseOkBody(61); + public static final ConnectionCloseOkBody CONNECTION_CLOSE_OK_0_9 = new ConnectionCloseOkBody(51); // Constructor - public ConnectionCloseOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException + private ConnectionCloseOkBody(int methodId) { + _ownMethodId = methodId; } - public ConnectionCloseOkBodyImpl( - ) - { - } public int getClazz() { @@ -71,14 +56,13 @@ public class ConnectionCloseOkBodyImpl e public int getMethod() { - return METHOD_ID; + return _ownMethodId; } protected int getBodySize() { - int size = 0; - return size; + return 0; } public void writeMethodPayload(DataOutput buffer) throws IOException @@ -87,14 +71,12 @@ public class ConnectionCloseOkBodyImpl e public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_0_91)dispatcher).dispatchConnectionCloseOk(this, channelId); + return dispatcher.dispatchConnectionCloseOk(this, channelId); } public String toString() { - StringBuilder buf = new StringBuilder("[ConnectionCloseOkBodyImpl: "); - buf.append("]"); - return buf.toString(); + return "[ConnectionCloseOkBody]"; } } Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ConnectionOpenBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ConnectionOpenBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 10; public static final int METHOD_ID = 40; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ConnectionOpenOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ConnectionOpenOkBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 10; public static final int METHOD_ID = 41; Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java (from r1628074, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java&r1=1628074&r2=1628336&rev=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java Mon Sep 29 23:20:39 2014 @@ -25,49 +25,35 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +package org.apache.qpid.framing; -import org.apache.qpid.codec.MarkableDataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; +import org.apache.qpid.codec.MarkableDataInput; -public class ConnectionRedirectBodyImpl extends AMQMethodBodyImpl implements ConnectionRedirectBody +public class ConnectionRedirectBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ConnectionRedirectBodyImpl(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } + private final int _ownMethodId; public static final int CLASS_ID = 10; - public static final int METHOD_ID = 50; // Fields declared in specification private final AMQShortString _host; // [host] private final AMQShortString _knownHosts; // [knownHosts] // Constructor - public ConnectionRedirectBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException + public ConnectionRedirectBody(MarkableDataInput buffer, ProtocolVersion protocolVersion) throws AMQFrameDecodingException, IOException { + _ownMethodId = ProtocolVersion.v8_0.equals(protocolVersion) ? 50 : 42; _host = readAMQShortString( buffer ); _knownHosts = readAMQShortString( buffer ); } - public ConnectionRedirectBodyImpl( - AMQShortString host, - AMQShortString knownHosts - ) + public ConnectionRedirectBody(ProtocolVersion protocolVersion, AMQShortString host, AMQShortString knownHosts) { + _ownMethodId = ProtocolVersion.v8_0.equals(protocolVersion) ? 50 : 42; _host = host; _knownHosts = knownHosts; } @@ -79,7 +65,7 @@ public class ConnectionRedirectBodyImpl public int getMethod() { - return METHOD_ID; + return _ownMethodId; } public final AMQShortString getHost() @@ -107,7 +93,7 @@ public class ConnectionRedirectBodyImpl public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionRedirect(this, channelId); + return dispatcher.dispatchConnectionRedirect(this, channelId); } public String toString() Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ConnectionSecureBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ConnectionSecureBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 10; public static final int METHOD_ID = 20; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ConnectionSecureOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ConnectionSecureOkBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 10; public static final int METHOD_ID = 21; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ConnectionStartBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ConnectionStartBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 10; public static final int METHOD_ID = 10; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ConnectionStartOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ConnectionStartOkBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 10; public static final int METHOD_ID = 11; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ConnectionTuneBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ConnectionTuneBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 10; public static final int METHOD_ID = 30; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ConnectionTuneOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ConnectionTuneOkBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 10; public static final int METHOD_ID = 31; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java Mon Sep 29 23:20:39 2014 @@ -938,7 +938,6 @@ public class EncodingUtils } else { - // really writing out unsigned byte writeUnsignedInteger(buffer, 0L); } } Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ExchangeBoundBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ExchangeBoundBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 40; public static final int METHOD_ID = 22; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ExchangeBoundOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ExchangeBoundOkBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 40; public static final int METHOD_ID = 23; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ExchangeDeclareBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ExchangeDeclareBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 40; public static final int METHOD_ID = 10; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ExchangeDeclareOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ExchangeDeclareOkBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 40; public static final int METHOD_ID = 11; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ExchangeDeleteBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ExchangeDeleteBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 40; public static final int METHOD_ID = 20; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBody.java Mon Sep 29 23:20:39 2014 @@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat public class ExchangeDeleteOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody { - private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() - { - public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException - { - return new ExchangeDeleteOkBody(in); - } - }; - - public static AMQMethodBodyInstanceFactory getFactory() - { - return FACTORY_INSTANCE; - } public static final int CLASS_ID = 40; public static final int METHOD_ID = 21; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
