activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1448657 - in /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker: Queue.scala QueueEntry.scala
Date Thu, 21 Feb 2013 14:36:40 GMT
Author: chirino
Date: Thu Feb 21 14:36:40 2013
New Revision: 1448657

URL: http://svn.apache.org/r1448657
Log:
Fixes: APLO-298 UOW warnings in latest snapshot

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/QueueEntry.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=1448657&r1=1448656&r2=1448657&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
Thu Feb 21 14:36:40 2013
@@ -1172,7 +1172,7 @@ class Queue(val router: LocalRouter, val
             }
         }
         if( uow!=null ) {
-          uow.release(binding.binding_kind+":"+id+":ack-merge")
+          uow.release(binding.binding_kind+":"+id+":ack-merge:"+entry.entry.seq)
         }
     }
   }

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/QueueEntry.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/QueueEntry.scala?rev=1448657&r1=1448656&r2=1448657&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/QueueEntry.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/QueueEntry.scala
Thu Feb 21 14:36:40 2013
@@ -669,7 +669,7 @@ class QueueEntry(val queue:Queue, val se
 
                 acquiredDelivery.ack = (consumed, uow)=> {
                   if( uow!=null ) {
-                    uow.retain(queue.binding.binding_kind+":"+queue.id+":ack-merge")
+                    uow.retain(queue.binding.binding_kind+":"+queue.id+":ack-merge:"+seq)
                   }
                   queue.ack_source.merge((acquiredQueueEntry, consumed, uow))
                 }



Mime
View raw message