activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1447574 - in /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker: QueueEntry.scala store/DelayingStoreSupport.scala
Date Tue, 19 Feb 2013 02:14:55 GMT
Author: chirino
Date: Tue Feb 19 02:14:55 2013
New Revision: 1447574

URL: http://svn.apache.org/r1447574
Log:
MQTT tests were still failing.. this should fix them.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/QueueEntry.scala
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/DelayingStoreSupport.scala

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=1447574&r1=1447573&r2=1447574&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
Tue Feb 19 02:14:55 2013
@@ -519,12 +519,12 @@ class QueueEntry(val queue:Queue, val se
           switch_to_swapped
         }
         fire_swap_out_watchers
-      } else {
-        if( remove_pending ) {
-          delivery.message.release
-          space -= delivery
-          super.remove
-        }
+      }
+      if( remove_pending ) {
+        remove_pending = false
+        delivery.message.release
+        space -= delivery
+        super.remove
       }
     }
 
@@ -532,6 +532,7 @@ class QueueEntry(val queue:Queue, val se
       space -= delivery
       state = new Swapped(delivery.storeKey, delivery.storeLocator, size, expiration, redelivery_count,
acquirer, sender)
       if( remove_pending ) {
+        remove_pending = false
         state.remove
       } else {
         if( can_combine_with_prev ) {

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/DelayingStoreSupport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/DelayingStoreSupport.scala?rev=1447574&r1=1447573&r2=1447574&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/DelayingStoreSupport.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/store/DelayingStoreSupport.scala
Tue Feb 19 02:14:55 2013
@@ -116,6 +116,8 @@ trait DelayingStoreSupport extends Store
 
   class DelayableUOW extends BaseRetained with StoreUOW {
 
+    override def toString: String = uow_id.toString
+
     val owners = scala.collection.mutable.HashSet[String]()
 
     def release(owner: String) {
@@ -530,9 +532,6 @@ trait DelayingStoreSupport extends Store
         None
       } else {
         uow.state = UowFlushing
-        if(!( !locator_based || uow.have_locators )) {
-          println("crap")
-        }
         assert( !locator_based || uow.have_locators )
         // It will not be possible to cancel the UOW anymore..
         uow.actions.foreach { case (_, action) =>



Mime
View raw message