activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1447505 - /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.scala
Date Mon, 18 Feb 2013 21:16:19 GMT
Author: chirino
Date: Mon Feb 18 21:16:19 2013
New Revision: 1447505

URL: http://svn.apache.org/r1447505
Log:
Fixes wanrning messags produced during test case run

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Queue.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=1447505&r1=1447504&r2=1447505&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
Mon Feb 18 21:16:19 2013
@@ -1087,12 +1087,7 @@ class Queue(val router: LocalRouter, val
         delivery.uow = if(delivery.storeKey == -1) {
           null
         } else {
-          if( original_uow == null ) {
-            create_uow(id)
-          } else {
-            original_uow.retain(binding.binding_kind+":"+id+":dlq")
-            original_uow
-          }
+          create_uow(binding.binding_kind+":"+id+":dlq", original_uow)
         }
         delivery.expiration=0
 
@@ -1112,6 +1107,7 @@ class Queue(val router: LocalRouter, val
               callback(delivery.uow)
               if( delivery.uow!=null ) {
                 delivery.uow.release(binding.binding_kind+":"+id+":dlq")
+                delivery.uow = null
               }
             }
           }



Mime
View raw message