You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/06/06 16:39:34 UTC
[2/3] qpid-broker-j git commit: QPID-7739: [Java Broker] [AMQP 1.0]
Change type of fields Session_1_0#_incomingWindow and
Session_1_0#_outgoingWindow to UnsignedInteger
QPID-7739: [Java Broker] [AMQP 1.0] Change type of fields Session_1_0#_incomingWindow and Session_1_0#_outgoingWindow to UnsignedInteger
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/ddc15384
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/ddc15384
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/ddc15384
Branch: refs/heads/master
Commit: ddc15384b464aa9a23ec51dfabe9a1e48ce35c37
Parents: 268338a
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Jun 6 13:50:29 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Jun 6 17:08:34 2017 +0100
----------------------------------------------------------------------
.../protocol/v1_0/AMQPConnection_1_0Impl.java | 2 +-
.../qpid/server/protocol/v1_0/Session_1_0.java | 23 ++++++++++----------
2 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ddc15384/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 bcae0f6..977dc8f 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
@@ -616,7 +616,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio
begin,
sendingChannelId,
receivingChannelId,
- getContextValue(Integer.class, AMQPConnection_1_0.CONNECTION_SESSION_CREDIT_WINDOW_SIZE));
+ getContextValue(Long.class, AMQPConnection_1_0.CONNECTION_SESSION_CREDIT_WINDOW_SIZE));
session.create();
_receivingSessions[receivingChannelId] = session;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ddc15384/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 3ec200b..fdcbefa 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
@@ -152,9 +152,9 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
private UnsignedInteger _initialOutgoingId = UnsignedInteger.ZERO;
private SequenceNumber _nextIncomingId;
- private final int _incomingWindow;
+ private final UnsignedInteger _incomingWindow;
private SequenceNumber _nextOutgoingId = new SequenceNumber(_initialOutgoingId.intValue());
- private int _outgoingWindow = DEFAULT_SESSION_BUFFER_SIZE;
+ private final UnsignedInteger _outgoingWindow = UnsignedInteger.valueOf(DEFAULT_SESSION_BUFFER_SIZE);
private UnsignedInteger _remoteIncomingWindow;
private UnsignedInteger _remoteOutgoingWindow = UnsignedInteger.ZERO;
private UnsignedInteger _lastSentIncomingLimit;
@@ -178,7 +178,7 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
Begin begin,
int sendingChannelId,
int receivingChannelId,
- int incomingWindow)
+ long incomingWindow)
{
super(connection, sendingChannelId);
_sendingChannel = sendingChannelId;
@@ -187,7 +187,7 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
_nextIncomingId = new SequenceNumber(begin.getNextOutgoingId().intValue());
_connection = connection;
_primaryDomain = getPrimaryDomain();
- _incomingWindow = incomingWindow;
+ _incomingWindow = UnsignedInteger.valueOf(incomingWindow);
AccessController.doPrivileged((new PrivilegedAction<Object>()
{
@@ -399,7 +399,7 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
// TODO - we should use a better metric here, and/or manage session credit across the whole connection
// send a flow if the window is at least half used up
- if (UnsignedInteger.valueOf(_incomingWindow).subtract(clientsCredit).compareTo(clientsCredit) >= 0)
+ if (_incomingWindow.subtract(clientsCredit).compareTo(clientsCredit) >= 0)
{
sendFlow();
}
@@ -409,7 +409,7 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
public UnsignedInteger getOutgoingWindow()
{
- return UnsignedInteger.valueOf(_outgoingWindow);
+ return _outgoingWindow;
}
public void receiveFlow(final Flow flow)
@@ -522,14 +522,13 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
{
if(_nextIncomingId != null)
{
- final long nextIncomingId = _nextIncomingId.longValue();
- flow.setNextIncomingId(UnsignedInteger.valueOf(nextIncomingId));
- _lastSentIncomingLimit = UnsignedInteger.valueOf(nextIncomingId + _incomingWindow);
+ flow.setNextIncomingId(_nextIncomingId.unsignedIntegerValue());
+ _lastSentIncomingLimit = _incomingWindow.add(_nextIncomingId.unsignedIntegerValue());
}
- flow.setIncomingWindow(UnsignedInteger.valueOf(_incomingWindow));
+ flow.setIncomingWindow(_incomingWindow);
flow.setNextOutgoingId(UnsignedInteger.valueOf(_nextOutgoingId.intValue()));
- flow.setOutgoingWindow(UnsignedInteger.valueOf(_outgoingWindow));
+ flow.setOutgoingWindow(_outgoingWindow);
send(flow);
}
@@ -679,7 +678,7 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
UnsignedInteger getIncomingWindow()
{
- return UnsignedInteger.valueOf(_incomingWindow);
+ return _incomingWindow;
}
AccessControlContext getAccessControllerContext()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org