Repository: qpid-broker-j Updated Branches: refs/heads/master 673adc12b -> 5a872b431
QPID-7739 : [Java Broker] [AMQP 1.0] Use correct types in operations with performative fields * use int for channel id * avoid setting of negative maxFrameSize (enforce maxFrameSize to be less than networkBufferSize) * in comparison operations for Disposition#first and Disposition#last use SequenceNumber 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/5a872b43 Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/5a872b43 Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/5a872b43 Branch: refs/heads/master Commit: 5a872b43176c054ae58272f161f7337b5c4d2200 Parents: 673adc1 Author: Alex Rudyy <[email protected]> Authored: Mon Jun 5 17:25:11 2017 +0100 Committer: Alex Rudyy <[email protected]> Committed: Mon Jun 5 17:25:11 2017 +0100 ---------------------------------------------------------------------- .../apache/qpid/server/model/Connection.java | 2 +- .../protocol/v0_10/AMQPConnection_0_10Impl.java | 2 +- .../server/protocol/v0_10/ServerConnection.java | 2 +- .../protocol/v0_8/AMQPConnection_0_8Impl.java | 12 ++--- .../protocol/v1_0/AMQPConnection_1_0.java | 6 +-- .../protocol/v1_0/AMQPConnection_1_0Impl.java | 48 ++++++++++---------- .../server/protocol/v1_0/ConnectionHandler.java | 18 ++++---- .../qpid/server/protocol/v1_0/Session_1_0.java | 34 +++++++------- .../server/protocol/v1_0/codec/FrameWriter.java | 3 +- .../server/protocol/v1_0/framing/AMQFrame.java | 6 +-- .../server/protocol/v1_0/framing/SASLFrame.java | 2 +- .../protocol/v1_0/framing/TransportFrame.java | 8 ++-- .../server/protocol/v1_0/type/FrameBody.java | 2 +- .../protocol/v1_0/type/SaslFrameBody.java | 2 +- .../protocol/v1_0/type/UnsignedShort.java | 20 +++++--- .../v1_0/type/security/SaslChallenge.java | 2 +- .../protocol/v1_0/type/security/SaslInit.java | 2 +- .../v1_0/type/security/SaslMechanisms.java | 2 +- .../v1_0/type/security/SaslOutcome.java | 2 +- .../v1_0/type/security/SaslResponse.java | 2 +- .../protocol/v1_0/type/transport/Attach.java | 2 +- .../protocol/v1_0/type/transport/Begin.java | 2 +- .../protocol/v1_0/type/transport/Close.java | 2 +- .../protocol/v1_0/type/transport/Detach.java | 2 +- .../v1_0/type/transport/Disposition.java | 2 +- .../protocol/v1_0/type/transport/End.java | 2 +- .../protocol/v1_0/type/transport/Flow.java | 2 +- .../protocol/v1_0/type/transport/Open.java | 2 +- .../protocol/v1_0/type/transport/Transfer.java | 2 +- .../server/protocol/v1_0/Session_1_0Test.java | 16 +++---- .../qpid/tests/protocol/v1_0/InputHandler.java | 18 ++++---- 31 files changed, 120 insertions(+), 109 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java b/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java index 9dc0cd6..5bd6aad 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java +++ b/broker-core/src/main/java/org/apache/qpid/server/model/Connection.java @@ -91,7 +91,7 @@ public interface Connection<X extends Connection<X>> extends ConfiguredObject<X> String getRemoteProcessPid(); @DerivedAttribute - long getSessionCountLimit(); + int getSessionCountLimit(); @DerivedAttribute Transport getTransport(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java index c4f8215..479f12c 100755 --- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java +++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java @@ -335,7 +335,7 @@ public class AMQPConnection_0_10Impl extends AbstractAMQPConnection<AMQPConnecti } @Override - public long getSessionCountLimit() + public int getSessionCountLimit() { return _connection.getSessionCountLimit(); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java index 449e03b..35d0cc4 100644 --- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java +++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java @@ -439,7 +439,7 @@ public class ServerConnection extends ConnectionInvoker } - public long getSessionCountLimit() + public int getSessionCountLimit() { return getChannelMax(); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java index 5a14a1a..b32ac40 100644 --- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java +++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java @@ -118,7 +118,7 @@ public class AMQPConnection_0_8Impl private volatile SaslNegotiator _saslNegotiator; - private volatile long _maxNoOfChannels; + private volatile int _maxNoOfChannels; private volatile ProtocolVersion _protocolVersion; private volatile MethodRegistry _methodRegistry; @@ -429,12 +429,12 @@ public class AMQPConnection_0_8Impl session.dispose(); } - public long getMaximumNumberOfChannels() + public int getMaximumNumberOfChannels() { return _maxNoOfChannels; } - private void setMaximumNumberOfChannels(Long value) + private void setMaximumNumberOfChannels(int value) { _maxNoOfChannels = value; } @@ -744,7 +744,7 @@ public class AMQPConnection_0_8Impl } @Override - public long getSessionCountLimit() + public int getSessionCountLimit() { return getMaximumNumberOfChannels(); } @@ -1226,8 +1226,8 @@ public class AMQPConnection_0_8Impl setMaxFrameSize(calculatedFrameMax); //0 means no implied limit, except that forced by protocol limitations (0xFFFF) - setMaximumNumberOfChannels( ((channelMax == 0l) || (channelMax > 0xFFFFL)) - ? 0xFFFFL + setMaximumNumberOfChannels( ((channelMax == 0) || (channelMax > 0xFFFF)) + ? 0xFFFF : channelMax); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java index 9ea7a11..9428e10 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java @@ -59,11 +59,11 @@ public interface AMQPConnection_1_0<C extends AMQPConnection_1_0<C>> extends AMQ AMQPDescribedTypeRegistry getDescribedTypeRegistry(); - int sendFrame(short channel, FrameBody body, List<QpidByteBuffer> payload); + int sendFrame(int channel, FrameBody body, List<QpidByteBuffer> payload); - void sendFrame(short channel, FrameBody body); + void sendFrame(int channel, FrameBody body); - void sendEnd(short sendChannel, End end, boolean b); + void sendEnd(int sendChannel, End end, boolean b); void sessionEnded(Session_1_0 session_1_0); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java index 1718435..bcae0f6 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java @@ -181,7 +181,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio private List<Symbol> _offeredCapabilities; private SoleConnectionEnforcementPolicy _soleConnectionEnforcementPolicy; - private static final short CONNECTION_CONTROL_CHANNEL = (short) 0; + private static final int CONNECTION_CONTROL_CHANNEL = 0; private static final int DEFAULT_CHANNEL_MAX = Math.min(Integer.getInteger("amqp.channel_max", 255), 0xFFFF); @@ -286,7 +286,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } @Override - public void receiveAttach(final short channel, final Attach attach) + public void receiveAttach(final int channel, final Attach attach) { assertState(ConnectionState.OPENED); final Session_1_0 session = getSession(channel); @@ -351,11 +351,11 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio FRAME_LOGGER.debug("RECV[{}|{}] : {}", _remoteAddress, channel, val); if (val instanceof FrameBody) { - ((FrameBody) val).invoke((short) channel, this); + ((FrameBody) val).invoke(channel, this); } else if (val instanceof SaslFrameBody) { - ((SaslFrameBody) val).invoke((short) channel, this); + ((SaslFrameBody) val).invoke(channel, this); } } @@ -381,7 +381,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } @Override - public void receiveClose(final short channel, final Close close) + public void receiveClose(final int channel, final Close close) { switch (_connectionState) { @@ -528,7 +528,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } @Override - public void sendEnd(final short channel, final End end, final boolean remove) + public void sendEnd(final int channel, final End end, final boolean remove) { sendFrame(channel, end); if (remove) @@ -545,7 +545,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } @Override - public void receiveEnd(final short channel, final End end) + public void receiveEnd(final int channel, final End end) { assertState(ConnectionState.OPENED); final Session_1_0 session = getSession(channel); @@ -560,13 +560,13 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } } - private void closeConnectionWithInvalidChannel(final short channel, final FrameBody frame) + private void closeConnectionWithInvalidChannel(final int channel, final FrameBody frame) { closeConnection(AmqpError.INVALID_FIELD, String.format("%s frame received on channel %d which is not mapped", frame.getClass().getSimpleName().toLowerCase(), channel)); } @Override - public void receiveDisposition(final short channel, + public void receiveDisposition(final int channel, final Disposition disposition) { assertState(ConnectionState.OPENED); @@ -583,11 +583,10 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } @Override - public void receiveBegin(final short receivingChannelId, final Begin begin) + public void receiveBegin(final int receivingChannelId, final Begin begin) { assertState(ConnectionState.OPENED); - short sendingChannelId; if (begin.getRemoteChannel() != null) { closeConnection(ConnectionError.FRAMING_ERROR, @@ -603,7 +602,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio if (_receivingSessions[receivingChannelId] == null) { - sendingChannelId = getFirstFreeChannel(); + int sendingChannelId = getFirstFreeChannel(); if (sendingChannelId == -1) { closeConnection(ConnectionError.FRAMING_ERROR, @@ -650,13 +649,13 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } - private short getFirstFreeChannel() + private int getFirstFreeChannel() { for (int i = 0; i <= _channelMax; i++) { if (_sendingSessions[i] == null) { - return (short) i; + return i; } } return -1; @@ -672,7 +671,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } @Override - public void receiveTransfer(final short channel, final Transfer transfer) + public void receiveTransfer(final int channel, final Transfer transfer) { assertState(ConnectionState.OPENED); final Session_1_0 session = getSession(channel); @@ -687,7 +686,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } @Override - public void receiveFlow(final short channel, final Flow flow) + public void receiveFlow(final int channel, final Flow flow) { assertState(ConnectionState.OPENED); final Session_1_0 session = getSession(channel); @@ -703,7 +702,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } @Override - public void receiveOpen(final short channel, final Open open) + public void receiveOpen(final int channel, final Open open) { assertState(ConnectionState.AWAIT_OPEN); @@ -717,8 +716,9 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio _sendingSessions = new Session_1_0[_channelMax + 1]; } _maxFrameSize = open.getMaxFrameSize() == null + || open.getMaxFrameSize().longValue() > getBroker().getNetworkBufferSize() ? getBroker().getNetworkBufferSize() - : Math.min(open.getMaxFrameSize().intValue(), getBroker().getNetworkBufferSize()); + : open.getMaxFrameSize().intValue(); _remoteContainerId = open.getContainerId(); if(open.getHostname() != null && !"".equals(open.getHostname().trim())) @@ -947,7 +947,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } @Override - public void receiveDetach(final short channel, final Detach detach) + public void receiveDetach(final int channel, final Detach detach) { assertState(ConnectionState.OPENED); final Session_1_0 session = getSession(channel); @@ -1150,7 +1150,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } @Override - public int sendFrame(final short channel, final FrameBody body, final List<QpidByteBuffer> payload) + public int sendFrame(final int channel, final FrameBody body, final List<QpidByteBuffer> payload) { if (!_closedForOutput) { @@ -1214,7 +1214,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } @Override - public void sendFrame(final short channel, final FrameBody body) + public void sendFrame(final int channel, final FrameBody body) { sendFrame(channel, body, null); } @@ -1628,9 +1628,9 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio } @Override - public long getSessionCountLimit() + public int getSessionCountLimit() { - return _channelMax+1; + return _channelMax + 1; } @Override @@ -1685,7 +1685,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio sendFrame(CONNECTION_CONTROL_CHANNEL, open); } - private Session_1_0 getSession(final short channel) + private Session_1_0 getSession(final int channel) { Session_1_0 session = _receivingSessions[channel]; if (session == null) http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConnectionHandler.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConnectionHandler.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConnectionHandler.java index 03a3794..7a56795 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConnectionHandler.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ConnectionHandler.java @@ -36,23 +36,23 @@ import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer; public interface ConnectionHandler extends SASLEndpoint { - void receiveOpen(short channel, Open close); + void receiveOpen(int channel, Open close); - void receiveClose(short channel, Close close); + void receiveClose(int channel, Close close); - void receiveBegin(short channel, Begin begin); + void receiveBegin(int channel, Begin begin); - void receiveEnd(short channel, End end); + void receiveEnd(int channel, End end); - void receiveAttach(short channel, Attach attach); + void receiveAttach(int channel, Attach attach); - void receiveDetach(short channel, Detach detach); + void receiveDetach(int channel, Detach detach); - void receiveTransfer(short channel, Transfer transfer); + void receiveTransfer(int channel, Transfer transfer); - void receiveDisposition(short channel, Disposition disposition); + void receiveDisposition(int channel, Disposition disposition); - void receiveFlow(short channel, Flow flow); + void receiveFlow(int channel, Flow flow); int getMaxFrameSize(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java index c203e50..6183b8f 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java @@ -138,8 +138,8 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget private final Map<UnsignedInteger, LinkEndpoint<? extends BaseSource, ? extends BaseTarget>> _inputHandleToEndpoint = new HashMap<>(); private final Set<LinkEndpoint<? extends BaseSource, ? extends BaseTarget>> _associatedLinkEndpoints = new HashSet<>(); - private final short _receivingChannel; - private final short _sendingChannel; + private final int _receivingChannel; + private final int _sendingChannel; private static final int DEFAULT_SESSION_BUFFER_SIZE = 1 << 11; @@ -172,8 +172,8 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget public Session_1_0(final AMQPConnection_1_0 connection, Begin begin, - short sendingChannelId, - short receivingChannelId, + int sendingChannelId, + int receivingChannelId, int incomingWindow) { super(connection, sendingChannelId); @@ -254,7 +254,7 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget SequenceNumber end = new SequenceNumber(last.intValue()); while (pos.compareTo(end) <= 0) { - unsettled.remove(new UnsignedInteger(pos.intValue())); + unsettled.remove(UnsignedInteger.valueOf(pos.intValue())); pos.incr(); } } @@ -469,18 +469,22 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget } - UnsignedInteger deliveryId = disposition.getFirst(); - UnsignedInteger last = disposition.getLast(); - if(last == null) + SequenceNumber deliveryId = new SequenceNumber(disposition.getFirst().intValue()); + SequenceNumber last; + if(disposition.getLast() == null) { last = deliveryId; } + else + { + last = new SequenceNumber(disposition.getLast().intValue()); + } while(deliveryId.compareTo(last)<=0) { - - Delivery delivery = unsettledTransfers.get(deliveryId); + UnsignedInteger deliveryIdUnsigned = UnsignedInteger.valueOf(deliveryId.intValue()); + Delivery delivery = unsettledTransfers.get(deliveryIdUnsigned); if(delivery != null) { delivery.getLinkEndpoint().receiveDeliveryState(delivery, @@ -488,10 +492,10 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget disposition.getSettled()); if (Boolean.TRUE.equals(disposition.getSettled())) { - unsettledTransfers.remove(deliveryId); + unsettledTransfers.remove(deliveryIdUnsigned); } } - deliveryId = deliveryId.add(UnsignedInteger.ONE); + deliveryId.incr(); } if(Boolean.TRUE.equals(disposition.getSettled())) { @@ -561,18 +565,16 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget break; case ACTIVE: detachLinks(); - short sendChannel = _sendingChannel; - _connection.sendEnd(sendChannel, end, true); + _connection.sendEnd(_sendingChannel, end, true); _sessionState = SessionState.END_SENT; break; default: - sendChannel = _sendingChannel; End reply = new End(); Error error = new Error(); error.setCondition(AmqpError.ILLEGAL_STATE); error.setDescription("END called on Session which has not been opened"); reply.setError(error); - _connection.sendEnd(sendChannel, reply, true); + _connection.sendEnd(_sendingChannel, reply, true); break; http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FrameWriter.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FrameWriter.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FrameWriter.java index c092ed1..fa30d85 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FrameWriter.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/codec/FrameWriter.java @@ -25,6 +25,7 @@ import java.util.List; import org.apache.qpid.server.bytebuffer.QpidByteBuffer; import org.apache.qpid.server.protocol.v1_0.framing.AMQFrame; +import org.apache.qpid.server.protocol.v1_0.type.UnsignedShort; import org.apache.qpid.server.transport.ByteBufferSender; public class FrameWriter @@ -62,7 +63,7 @@ public class FrameWriter body.putInt(totalSize); body.put((byte)2); // DOFF body.put(frame.getFrameType()); // AMQP Frame Type - body.putShort(frame.getChannel()); + body.putShort(UnsignedShort.valueOf(frame.getChannel()).shortValue()); if(typeWriter != null) { typeWriter.writeToBuffer(body); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java index 2e94d2f..8ab89ea 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/AMQFrame.java @@ -47,17 +47,17 @@ public abstract class AMQFrame<T> return _payload; } - public static TransportFrame createAMQFrame(short channel, FrameBody frameBody) + public static TransportFrame createAMQFrame(int channel, FrameBody frameBody) { return createAMQFrame(channel, frameBody, null); } - public static TransportFrame createAMQFrame(short channel, FrameBody frameBody, List<QpidByteBuffer> payload) + public static TransportFrame createAMQFrame(int channel, FrameBody frameBody, List<QpidByteBuffer> payload) { return new TransportFrame(channel, frameBody, payload); } - abstract public short getChannel(); + abstract public int getChannel(); abstract public byte getFrameType(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/SASLFrame.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/SASLFrame.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/SASLFrame.java index 321697e..164a85d 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/SASLFrame.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/SASLFrame.java @@ -29,7 +29,7 @@ public final class SASLFrame extends AMQFrame<SaslFrameBody> super(frameBody); } - @Override public short getChannel() + @Override public int getChannel() { return (short)0; } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/TransportFrame.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/TransportFrame.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/TransportFrame.java index 1f5b7f0..e29c92c 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/TransportFrame.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/framing/TransportFrame.java @@ -26,21 +26,21 @@ import org.apache.qpid.server.protocol.v1_0.type.FrameBody; public final class TransportFrame extends AMQFrame<FrameBody> { - private final short _channel; + private final int _channel; - public TransportFrame(short channel, FrameBody frameBody) + public TransportFrame(int channel, FrameBody frameBody) { super(frameBody); _channel = channel; } - public TransportFrame(short channel, FrameBody frameBody, List<QpidByteBuffer> payload) + public TransportFrame(int channel, FrameBody frameBody, List<QpidByteBuffer> payload) { super(frameBody, payload); _channel = channel; } - @Override public short getChannel() + @Override public int getChannel() { return _channel; } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/FrameBody.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/FrameBody.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/FrameBody.java index b647353..235566d 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/FrameBody.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/FrameBody.java @@ -25,5 +25,5 @@ import org.apache.qpid.server.protocol.v1_0.ConnectionHandler; public interface FrameBody { - void invoke(short channel, ConnectionHandler conn); + void invoke(int channel, ConnectionHandler conn); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/SaslFrameBody.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/SaslFrameBody.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/SaslFrameBody.java index 3266b79..e4c49e7 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/SaslFrameBody.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/SaslFrameBody.java @@ -23,5 +23,5 @@ import org.apache.qpid.server.protocol.v1_0.SASLEndpoint; public interface SaslFrameBody { - void invoke(final short channel, SASLEndpoint conn); + void invoke(final int channel, SASLEndpoint conn); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java index b8cdd77..c0b828f 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/UnsignedShort.java @@ -37,7 +37,7 @@ public final class UnsignedShort extends Number implements Comparable<UnsignedSh } } - public UnsignedShort(short underlying) + private UnsignedShort(short underlying) { _underlying = underlying; } @@ -122,14 +122,22 @@ public final class UnsignedShort extends Number implements Comparable<UnsignedSh } } - public static UnsignedShort valueOf(final String value) + public static UnsignedShort valueOf(int intValue) { - int intVal = Integer.parseInt(value); - if(intVal < 0 || intVal >= (1<<16)) + if (intValue < 0 || intValue >= (1 << 16)) { - throw new NumberFormatException("Value \""+value+"\" lies outside the range [" + 0 + "-" + (1<<16) +")."); + throw new NumberFormatException(String.format("Value \"%d\" lies outside the range [%d-%d).", + intValue, + 0, + (1 << 16))); } - return valueOf((short)intVal); + return valueOf((short) intValue); + } + + public static UnsignedShort valueOf(final String value) + { + int intVal = Integer.parseInt(value); + return valueOf(intVal); } } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslChallenge.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslChallenge.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslChallenge.java index 68579f7..3fc5aa4 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslChallenge.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslChallenge.java @@ -66,7 +66,7 @@ public class SaslChallenge return builder.toString(); } - public void invoke(final short channel, SASLEndpoint conn) + public void invoke(final int channel, SASLEndpoint conn) { conn.receiveSaslChallenge(this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslInit.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslInit.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslInit.java index d70d488..a2530d7 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslInit.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslInit.java @@ -110,7 +110,7 @@ public class SaslInit return builder.toString(); } - public void invoke(final short channel, SASLEndpoint conn) + public void invoke(final int channel, SASLEndpoint conn) { conn.receiveSaslInit(this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslMechanisms.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslMechanisms.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslMechanisms.java index 1b52dbd..9bdbc76 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslMechanisms.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslMechanisms.java @@ -67,7 +67,7 @@ public class SaslMechanisms return builder.toString(); } - public void invoke(final short channel, SASLEndpoint conn) + public void invoke(final int channel, SASLEndpoint conn) { conn.receiveSaslMechanisms(this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslOutcome.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslOutcome.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslOutcome.java index 9c2072a..4854923 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslOutcome.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslOutcome.java @@ -88,7 +88,7 @@ public class SaslOutcome return builder.toString(); } - public void invoke(final short channel, SASLEndpoint conn) + public void invoke(final int channel, SASLEndpoint conn) { conn.receiveSaslOutcome(this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslResponse.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslResponse.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslResponse.java index 7948249..0946c5f 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslResponse.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/security/SaslResponse.java @@ -66,7 +66,7 @@ public class SaslResponse return builder.toString(); } - public void invoke(final short channel, SASLEndpoint conn) + public void invoke(final int channel, SASLEndpoint conn) { conn.receiveSaslResponse(this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java index 2fee192..3bae54d 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Attach.java @@ -358,7 +358,7 @@ public class Attach implements FrameBody return builder.toString(); } - public void invoke(short channel, ConnectionHandler conn) + public void invoke(int channel, ConnectionHandler conn) { conn.receiveAttach(channel, this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java index b3038cd..0e0489a 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Begin.java @@ -224,7 +224,7 @@ public class Begin implements FrameBody return builder.toString(); } - public void invoke(short channel, ConnectionHandler conn) + public void invoke(int channel, ConnectionHandler conn) { conn.receiveBegin(channel, this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java index 142eacd..a7cfe2a 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Close.java @@ -65,7 +65,7 @@ public class Close implements FrameBody return builder.toString(); } - public void invoke(short channel, ConnectionHandler conn) + public void invoke(int channel, ConnectionHandler conn) { conn.receiveClose(channel, this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java index 34b3824..e1d1da8 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Detach.java @@ -110,7 +110,7 @@ public class Detach implements FrameBody return builder.toString(); } - public void invoke(short channel, ConnectionHandler conn) + public void invoke(int channel, ConnectionHandler conn) { conn.receiveDetach(channel, this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java index 4c29394..1b8722a 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Disposition.java @@ -170,7 +170,7 @@ public class Disposition implements FrameBody return builder.toString(); } - public void invoke(short channel, ConnectionHandler conn) + public void invoke(int channel, ConnectionHandler conn) { conn.receiveDisposition(channel, this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java index 1c89291..75392c9 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/End.java @@ -65,7 +65,7 @@ public class End implements FrameBody return builder.toString(); } - public void invoke(short channel, ConnectionHandler conn) + public void invoke(int channel, ConnectionHandler conn) { conn.receiveEnd(channel, this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java index 2d11684..63b567e 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Flow.java @@ -287,7 +287,7 @@ public class Flow implements FrameBody return builder.toString(); } - public void invoke(short channel, ConnectionHandler conn) + public void invoke(int channel, ConnectionHandler conn) { conn.receiveFlow(channel, this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java index 59fe9ba..f8527d3 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Open.java @@ -269,7 +269,7 @@ public class Open implements FrameBody } @Override - public void invoke(short channel, ConnectionHandler conn) + public void invoke(int channel, ConnectionHandler conn) { conn.receiveOpen(channel, this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java index c931487..6042319 100644 --- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java +++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/transport/Transfer.java @@ -290,7 +290,7 @@ public class Transfer implements FrameBody return builder.toString(); } - public void invoke(short channel, ConnectionHandler conn) + public void invoke(int channel, ConnectionHandler conn) { conn.receiveTransfer(channel, this); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java index 7c45510..4a22d8e 100644 --- a/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java +++ b/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/Session_1_0Test.java @@ -314,7 +314,7 @@ public class Session_1_0Test extends QpidTestCase _session.receiveAttach(nullSourceAttach); ArgumentCaptor<FrameBody> frameCapture = ArgumentCaptor.forClass(FrameBody.class); - verify(_connection, times(3)).sendFrame(eq((short) _session.getChannelId()), frameCapture.capture()); + verify(_connection, times(3)).sendFrame(eq(_session.getChannelId()), frameCapture.capture()); Attach sentAttach = (Attach) frameCapture.getAllValues().get(2); assertEquals("Unexpected name", nullSourceAttach.getName(), sentAttach.getName()); @@ -382,7 +382,7 @@ public class Session_1_0Test extends QpidTestCase sendDetach(_session, attach.getHandle(), false); ArgumentCaptor<FrameBody> frameCapture = ArgumentCaptor.forClass(FrameBody.class); - verify(_connection, times(2)).sendFrame(eq((short) _session.getChannelId()), frameCapture.capture()); + verify(_connection, times(2)).sendFrame(eq(_session.getChannelId()), frameCapture.capture()); assertTrue(frameCapture.getAllValues().get(1) instanceof Detach); assertQueues(TOPIC_NAME, LifetimePolicy.PERMANENT); @@ -410,7 +410,7 @@ public class Session_1_0Test extends QpidTestCase sendDetach(_session, attach.getHandle(), false); ArgumentCaptor<FrameBody> frameCapture = ArgumentCaptor.forClass(FrameBody.class); - verify(_connection, times(2)).sendFrame(eq((short) _session.getChannelId()), frameCapture.capture()); + verify(_connection, times(2)).sendFrame(eq(_session.getChannelId()), frameCapture.capture()); assertTrue(frameCapture.getAllValues().get(1) instanceof Detach); assertQueues(TOPIC_NAME, LifetimePolicy.PERMANENT); @@ -527,7 +527,7 @@ public class Session_1_0Test extends QpidTestCase assertEquals("Unexpected consumers size", 1, consumers.size()); ArgumentCaptor<FrameBody> frameCapture = ArgumentCaptor.forClass(FrameBody.class); - verify(_connection).sendFrame(eq((short) _session.getChannelId()), frameCapture.capture()); + verify(_connection).sendFrame(eq(_session.getChannelId()), frameCapture.capture()); Attach sentAttach = (Attach) frameCapture.getValue(); assertEquals("Unexpected name", receivedAttach.getName(), sentAttach.getName()); @@ -559,7 +559,7 @@ public class Session_1_0Test extends QpidTestCase final int invocationOffset) { ArgumentCaptor<FrameBody> frameCapture = ArgumentCaptor.forClass(FrameBody.class); - verify(connection, times(invocationOffset + 1)).sendFrame(eq((short) session.getChannelId()), frameCapture.capture()); + verify(connection, times(invocationOffset + 1)).sendFrame(eq(session.getChannelId()), frameCapture.capture()); List<FrameBody> sentFrames = frameCapture.getAllValues(); assertTrue("unexpected Frame sent", sentFrames.get(invocationOffset) instanceof Detach); @@ -591,7 +591,7 @@ public class Session_1_0Test extends QpidTestCase final int invocationOffset) { ArgumentCaptor<FrameBody> frameCapture = ArgumentCaptor.forClass(FrameBody.class); - verify(connection, times(invocationOffset + 1)).sendFrame(eq((short) session.getChannelId()), + verify(connection, times(invocationOffset + 1)).sendFrame(eq(session.getChannelId()), frameCapture.capture()); return (Attach) frameCapture.getAllValues().get(invocationOffset); } @@ -615,7 +615,7 @@ public class Session_1_0Test extends QpidTestCase private void assertAttachFailed(final AMQPConnection_1_0 connection, final Session_1_0 session, final Attach attach, int invocationOffset) { ArgumentCaptor<FrameBody> frameCapture = ArgumentCaptor.forClass(FrameBody.class); - verify(connection, times(invocationOffset + 2)).sendFrame(eq((short) session.getChannelId()), frameCapture.capture()); + verify(connection, times(invocationOffset + 2)).sendFrame(eq(session.getChannelId()), frameCapture.capture()); List<FrameBody> sentFrames = frameCapture.getAllValues(); assertTrue("unexpected Frame sent", sentFrames.get(invocationOffset) instanceof Attach); @@ -749,7 +749,7 @@ public class Session_1_0Test extends QpidTestCase { Begin begin = mock(Begin.class); when(begin.getNextOutgoingId()).thenReturn(new UnsignedInteger(channelId)); - Session_1_0 session = new Session_1_0(connection, begin, (short) channelId, (short) channelId, 2048); + Session_1_0 session = new Session_1_0(connection, begin, channelId, channelId, 2048); return session; } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/5a872b43/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/InputHandler.java ---------------------------------------------------------------------- diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/InputHandler.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/InputHandler.java index 08c3334..8468f5a 100644 --- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/InputHandler.java +++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/InputHandler.java @@ -143,55 +143,55 @@ public class InputHandler extends ChannelInboundHandlerAdapter private class MyConnectionHandler implements ConnectionHandler { @Override - public void receiveOpen(final short channel, final Open close) + public void receiveOpen(final int channel, final Open close) { System.out.println(); } @Override - public void receiveClose(final short channel, final Close close) + public void receiveClose(final int channel, final Close close) { } @Override - public void receiveBegin(final short channel, final Begin begin) + public void receiveBegin(final int channel, final Begin begin) { } @Override - public void receiveEnd(final short channel, final End end) + public void receiveEnd(final int channel, final End end) { } @Override - public void receiveAttach(final short channel, final Attach attach) + public void receiveAttach(final int channel, final Attach attach) { } @Override - public void receiveDetach(final short channel, final Detach detach) + public void receiveDetach(final int channel, final Detach detach) { } @Override - public void receiveTransfer(final short channel, final Transfer transfer) + public void receiveTransfer(final int channel, final Transfer transfer) { } @Override - public void receiveDisposition(final short channel, final Disposition disposition) + public void receiveDisposition(final int channel, final Disposition disposition) { } @Override - public void receiveFlow(final short channel, final Flow flow) + public void receiveFlow(final int channel, final Flow flow) { } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
