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
