You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/10/26 06:22:07 UTC
[1/3] qpid-broker-j git commit: QPID-7989: [Qpid Broker-J] [AMQP 1.0]
Wire up UnacknowledgedMessageCount session statistic.
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 948b284fd -> cb6e719d4
QPID-7989: [Qpid Broker-J] [AMQP 1.0] Wire up UnacknowledgedMessageCount session statistic.
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/439d9e6b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/439d9e6b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/439d9e6b
Branch: refs/heads/master
Commit: 439d9e6b17680b0821cab7051eddd0e2e215c31d
Parents: 948b284
Author: Keith Wall <ke...@gmail.com>
Authored: Wed Oct 25 22:34:52 2017 +0100
Committer: Keith Wall <ke...@gmail.com>
Committed: Wed Oct 25 23:00:12 2017 +0100
----------------------------------------------------------------------
.../apache/qpid/server/protocol/v1_0/Session_1_0.java | 13 +------------
.../protocol/v1_0/delivery/DeliveryRegistry.java | 1 +
.../protocol/v1_0/delivery/DeliveryRegistryImpl.java | 6 ++++++
3 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/439d9e6b/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 d18712a..bdc43c0 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,7 +152,6 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
private volatile long _startedTransactions;
private volatile long _committedTransactions;
private volatile long _rolledBackTransactions;
- private volatile int _unacknowledgedMessages;
public Session_1_0(final AMQPConnection_1_0 connection,
Begin begin,
@@ -1091,7 +1090,7 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
@Override
public int getUnacknowledgedMessageCount()
{
- return _unacknowledgedMessages;
+ return _outgoingDeliveryRegistry.size();
}
@Override
@@ -1204,16 +1203,6 @@ public class Session_1_0 extends AbstractAMQPSession<Session_1_0, ConsumerTarget
_rolledBackTransactions++;
}
- void incrementUnacknowledged()
- {
- _unacknowledgedMessages++;
- }
-
- void decrementUnacknowledged()
- {
- _unacknowledgedMessages--;
- }
-
@Override
public String toString()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/439d9e6b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/delivery/DeliveryRegistry.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/delivery/DeliveryRegistry.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/delivery/DeliveryRegistry.java
index 8a054fd..a018824 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/delivery/DeliveryRegistry.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/delivery/DeliveryRegistry.java
@@ -31,4 +31,5 @@ public interface DeliveryRegistry
UnsettledDelivery getDelivery(UnsignedInteger deliveryId);
void removeDeliveriesForLinkEndpoint(LinkEndpoint<?, ?> linkEndpoint);
UnsignedInteger getDeliveryIdByTag(Binary deliveryTag);
+ int size();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/439d9e6b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/delivery/DeliveryRegistryImpl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/delivery/DeliveryRegistryImpl.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/delivery/DeliveryRegistryImpl.java
index 466164f..bf7fe56 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/delivery/DeliveryRegistryImpl.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/delivery/DeliveryRegistryImpl.java
@@ -76,4 +76,10 @@ public class DeliveryRegistryImpl implements DeliveryRegistry
{
return _deliveryIds.get(deliveryTag);
}
+
+ @Override
+ public int size()
+ {
+ return _deliveries.size();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-broker-j git commit: QPID-7990: [Qpid Broker-J]
[AMQP0-8..0-91] Remove dead _modelObject reference
Posted by kw...@apache.org.
QPID-7990: [Qpid Broker-J] [AMQP0-8..0-91] Remove dead _modelObject reference
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/b0a67330
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/b0a67330
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/b0a67330
Branch: refs/heads/master
Commit: b0a67330095f1ec4c1bf84e46fc3487675d62913
Parents: 439d9e6
Author: Keith Wall <ke...@gmail.com>
Authored: Wed Oct 25 22:59:42 2017 +0100
Committer: Keith Wall <ke...@gmail.com>
Committed: Wed Oct 25 23:00:26 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b0a67330/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index b5cc43a..c7c0f3e 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
@@ -172,7 +172,7 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
private final AtomicLong _txnCount = new AtomicLong(0);
private final AMQPConnection_0_8 _connection;
- private AtomicBoolean _closing = new AtomicBoolean(false);
+ private final AtomicBoolean _closing = new AtomicBoolean(false);
private final Set<Object> _blockingEntities = Collections.synchronizedSet(new HashSet<Object>());
@@ -188,7 +188,6 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
private final ClientDeliveryMethod _clientDeliveryMethod;
private final ImmediateAction _immediateAction = new ImmediateAction();
- private Session<?> _modelObject;
private long _blockTime;
private long _blockingTimeout;
private boolean _confirmOnPublish;
@@ -790,10 +789,6 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
{
unsubscribeAllConsumers();
setDefaultQueue(null);
- if(_modelObject != null)
- {
- _modelObject.delete();
- }
for (Action<? super AMQChannel> task : _taskList)
{
task.performAction(this);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-broker-j git commit: NO-JIRA: [Qpid Broker-J] [System
Tests] Bump Qpid JMS Client and Netty test dependencies
Posted by kw...@apache.org.
NO-JIRA: [Qpid Broker-J] [System Tests] Bump Qpid JMS Client and Netty test dependencies
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/cb6e719d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/cb6e719d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/cb6e719d
Branch: refs/heads/master
Commit: cb6e719d4dddababd51a249e28ada6549fab79f4
Parents: b0a6733
Author: Keith Wall <ke...@gmail.com>
Authored: Thu Oct 26 07:21:43 2017 +0100
Committer: Keith Wall <ke...@gmail.com>
Committed: Thu Oct 26 07:21:43 2017 +0100
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/cb6e719d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2b4941a..3d51a3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,12 +145,12 @@
<!-- test dependency version numbers -->
<junit-version>4.11</junit-version>
<mockito-version>1.9.5</mockito-version>
- <netty-version>4.1.14.Final</netty-version>
+ <netty-version>4.1.16.Final</netty-version>
<hamcrest-version>1.3</hamcrest-version>
<maven-core-version>3.5.0</maven-core-version>
<maven-resolver-version>1.0.3</maven-resolver-version>
<httpclient-version>4.5.3</httpclient-version>
- <qpid-jms-client-version>0.24.0</qpid-jms-client-version>
+ <qpid-jms-client-version>0.26.0</qpid-jms-client-version>
<qpid-jms-client-amqp-0-x-version>6.1.4</qpid-jms-client-amqp-0-x-version>
<exec-maven-plugin-version>1.3.2</exec-maven-plugin-version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org