You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/03/10 15:38:23 UTC
svn commit: r921370 - in
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid:
qmf/QMFService.java server/configuration/SubscriptionConfig.java
server/subscription/SubscriptionImpl.java
server/subscription/Subscription_0_10.java
Author: robbie
Date: Wed Mar 10 14:38:23 2010
New Revision: 921370
URL: http://svn.apache.org/viewvc?rev=921370&view=rev
Log:
QPID-2379: add getDelivered() to Subscription
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java?rev=921370&r1=921369&r2=921370&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java Wed Mar 10 14:38:23 2010
@@ -1404,8 +1404,7 @@ public class QMFService implements Confi
public Long getDelivered()
{
- // TODO
- return 0l;
+ return _obj.getDelivered();
}
public UUID getId()
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java?rev=921370&r1=921369&r2=921370&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SubscriptionConfig.java Wed Mar 10 14:38:23 2010
@@ -43,5 +43,5 @@ public interface SubscriptionConfig exte
boolean isExplicitAcknowledge();
-
+ Long getDelivered();
}
\ No newline at end of file
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java?rev=921370&r1=921369&r2=921370&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java Wed Mar 10 14:38:23 2010
@@ -94,6 +94,7 @@ public abstract class SubscriptionImpl i
private LogSubject _logSubject;
private LogActor _logActor;
private UUID _id;
+ private final AtomicLong _deliveredCount = new AtomicLong(0);
private long _createTime = System.currentTimeMillis();
@@ -340,7 +341,11 @@ public abstract class SubscriptionImpl i
{
return getQueue().getConfigStore();
}
-
+
+ public Long getDelivered()
+ {
+ return _deliveredCount.get();
+ }
public synchronized void setQueue(AMQQueue queue, boolean exclusive)
{
@@ -648,6 +653,7 @@ public abstract class SubscriptionImpl i
throws AMQException
{
_deliveryMethod.deliverToClient(this,entry,deliveryTag);
+ _deliveredCount.incrementAndGet();
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java?rev=921370&r1=921369&r2=921370&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java Wed Mar 10 14:38:23 2010
@@ -101,6 +101,7 @@ public class Subscription_0_10 implement
private String _traceExclude;
private String _trace;
private long _createTime = System.currentTimeMillis();
+ private final AtomicLong _deliveredCount = new AtomicLong(0);
public Subscription_0_10(ServerSession session, String destination, MessageAcceptMode acceptMode,
@@ -257,6 +258,11 @@ public class Subscription_0_10 implement
{
return getQueue().getConfigStore();
}
+
+ public Long getDelivered()
+ {
+ return _deliveredCount.get();
+ }
public void creditStateChanged(boolean hasCredit)
{
@@ -558,7 +564,7 @@ public class Subscription_0_10 implement
}
_session.sendMessage(xfr, _postIdSettingAction);
-
+ _deliveredCount.incrementAndGet();
if(_acceptMode == MessageAcceptMode.NONE && _acquireMode == MessageAcquireMode.PRE_ACQUIRED)
{
forceDequeue(entry, false);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org