From commits-return-15303-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Tue Jan 04 17:48:38 2011 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 73798 invoked from network); 4 Jan 2011 17:48:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Jan 2011 17:48:38 -0000 Received: (qmail 21358 invoked by uid 500); 4 Jan 2011 17:48:38 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 21290 invoked by uid 500); 4 Jan 2011 17:48:37 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 21283 invoked by uid 99); 4 Jan 2011 17:48:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jan 2011 17:48:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jan 2011 17:48:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D1E69238890A; Tue, 4 Jan 2011 17:48:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1055118 - in /activemq/activemq-apollo/trunk: apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/RuntimeResource.scala Date: Tue, 04 Jan 2011 17:48:14 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110104174814.D1E69238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Tue Jan 4 17:48:14 2011 New Revision: 1055118 URL: http://svn.apache.org/viewvc?rev=1055118&view=rev Log: Couple of bug fixes. Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/RuntimeResource.scala Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala?rev=1055118&r1=1055117&r2=1055118&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala (original) +++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala Tue Jan 4 17:48:14 2011 @@ -1187,6 +1187,8 @@ class QueueEntry(val queue:Queue, val se queue.swapping_in_size -= size } queue.individual_swapped_items -= 1 + queue.swap_out_item_counter -= 1 + queue.swap_out_size_counter -= size super.remove } Modified: activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/RuntimeResource.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/RuntimeResource.scala?rev=1055118&r1=1055117&r2=1055118&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/RuntimeResource.scala (original) +++ activemq/activemq-apollo/trunk/apollo-web/src/main/scala/org/apache/activemq/apollo/web/resources/RuntimeResource.scala Tue Jan 4 17:48:14 2011 @@ -364,6 +364,7 @@ case class RuntimeResource(parent:Broker q.all_subscriptions.valuesIterator.toSeq.foreach{ sub => val status = new QueueConsumerStatusDTO sub.consumer.connection.foreach(x=> status.link = link(x)) + status.position = sub.pos.seq status.total_dispatched_count = sub.total_dispatched_count status.total_dispatched_size = sub.total_dispatched_size status.total_ack_count = sub.total_ack_count