Author: chirino
Date: Mon Nov 8 15:39:15 2010
New Revision: 1032605
URL: http://svn.apache.org/viewvc?rev=1032605&view=rev
Log:
Fixes NPE
Modified:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
Modified:
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
URL:
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala?rev=1032605&r1=1032604&r2=1032605&view=diff
==============================================================================
---
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
(original)
+++
activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Router.scala
Mon Nov 8 15:39:15 2010
@@ -453,14 +453,15 @@ case class DeliveryProducerRoute(val rou
private def delivered(delivery: Delivery): Unit = {
if (pendingAck != null) {
if (delivery.uow != null) {
+ val ack = pendingAck
delivery.uow.setDisposer(^ {
- pendingAck(null)
- pendingAck=null
+ ack(null)
})
+
} else {
pendingAck(null)
- pendingAck==null
}
+ pendingAck==null
}
if (delivery.uow != null) {
delivery.uow.release
