4 files changed, 9 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/amqp/descriptors.h b/qpid/cpp/src/qpid/amqp/descriptors.h
index 2cdaaf9202..a9ee12644a 100644
--- a/qpid/cpp/src/qpid/amqp/descriptors.h
+++ b/qpid/cpp/src/qpid/amqp/descriptors.h
@@ -127,7 +127,7 @@ const std::string RESOURCE_DELETED("amqp:resource-deleted");
 const std::string PRECONDITION_FAILED("amqp:precondition-failed");
 namespace transaction {
 const std::string UNKNOWN_ID("amqp:transaction:unknown-id");
-const std::string ROLLBACK("amqp:transaction:rolback");
+const std::string ROLLBACK("amqp:transaction:rollback");
 }
 }
 }} // namespace qpid::amqp
diff --git a/qpid/cpp/src/qpid/broker/TxDequeue.cpp b/qpid/cpp/src/qpid/broker/TxDequeue.cpp
index bd83b434a9..e9a2e0ca98 100644
--- a/qpid/cpp/src/qpid/broker/TxDequeue.cpp
+++ b/qpid/cpp/src/qpid/broker/TxDequeue.cpp
@@ -28,7 +28,7 @@ namespace broker {
 
 TxDequeue::TxDequeue(QueueCursor m, boost::shared_ptr<Queue> q,
                      qpid::framing::SequenceNumber mId, qpid::framing::SequenceNumber rId)
-    : message(m), queue(q), messageId(mId), replicationId(rId) {}
+    : message(m), queue(q), messageId(mId), replicationId(rId), releaseOnAbort(true), redeliveredOnAbort(true) {}
 
 bool TxDequeue::prepare(TransactionContext* ctxt) throw()
 {
@@ -55,7 +55,10 @@ void TxDequeue::commit() throw()
     }
 }
 
-void TxDequeue::rollback() throw() {}
+void TxDequeue::rollback() throw()
+{
+    if (releaseOnAbort) queue->release(message, redeliveredOnAbort);
+}
 
 void TxDequeue::callObserver(const boost::shared_ptr<TransactionObserver>& observer)
 {
diff --git a/qpid/cpp/src/qpid/broker/TxDequeue.h b/qpid/cpp/src/qpid/broker/TxDequeue.h
index e312df9e31..e861bcaa77 100644
--- a/qpid/cpp/src/qpid/broker/TxDequeue.h
+++ b/qpid/cpp/src/qpid/broker/TxDequeue.h
@@ -46,6 +46,8 @@ class TxDequeue: public TxOp
     boost::shared_ptr<Queue> queue;
     qpid::framing::SequenceNumber messageId;
     qpid::framing::SequenceNumber replicationId;
+    bool releaseOnAbort;
+    bool redeliveredOnAbort;
 };
 }} // namespace qpid::broker
 
diff --git a/qpid/cpp/src/qpid/broker/amqp/Session.cpp b/qpid/cpp/src/qpid/broker/amqp/Session.cpp
index 68a735709b..7f4790fa96 100644
--- a/qpid/cpp/src/qpid/broker/amqp/Session.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Session.cpp
@@ -812,6 +812,7 @@ void Session::abort()
     if (txn) {
         txn->rollback();
         txAborted();
+        txn = boost::intrusive_ptr<TxBuffer>();
     }
 }