Author: chirino
Date: Thu Mar 21 17:17:52 2013
New Revision: 1459409
URL: http://svn.apache.org/r1459409
Log:
Backout an unintended change from the last commit.
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
Modified:
activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala?rev=1459409&r1=1459408&r2=1459409&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
(original)
+++
activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
Thu Mar 21 17:17:52 2013
@@ -1184,12 +1184,9 @@ class StompProtocolHandler extends Proto
var routing_items = 0
- val deliveries_waiting_for_ack = new util.HashSet[Delivery]()
-
override def offer(delivery: Delivery): Boolean = {
if( full )
return false
- deliveries_waiting_for_ack.add(delivery)
routing_size += delivery.size
routing_items += 1
val original_ack = delivery.ack
@@ -1200,7 +1197,6 @@ class StompProtocolHandler extends Proto
}
routing_items -= 1
routing_size -= delivery.size
- deliveries_waiting_for_ack.remove(delivery)
if( routing_size==0 && !pending_routing_empty_callbacks.isEmpty) {
val t = pending_routing_empty_callbacks
pending_routing_empty_callbacks = ListBuffer()
