QPID-818 : Persistent Pub/Sub can get exception on acking message

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@631936 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 1 insertions, 22 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java b/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
index ac29998c2a..c62a7880a8 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
@@ -100,10 +100,9 @@ public class TxAck implements TxnOp
         //make persistent changes, i.e. dequeue and decrementReference
         for (UnacknowledgedMessage msg : _unacked)
         {
-            //msg.restoreTransientMessageData();
-
             //Message has been ack so discard it. This will dequeue and decrement the reference.
             msg.discard(storeContext);
+
         }
     }
 
@@ -115,7 +114,6 @@ public class TxAck implements TxnOp
         //in memory (persistent changes will be rolled back by store)
         for (UnacknowledgedMessage msg : _unacked)
         {
-            msg.clearTransientMessageData();
             msg.getMessage().takeReference();
         }
     }
@@ -124,11 +122,6 @@ public class TxAck implements TxnOp
     {
         //remove the unacked messages from the channels map
         _map.remove(_unacked);
-        for (UnacknowledgedMessage msg : _unacked)
-        {
-            msg.clearTransientMessageData();
-        }
-
     }
 
     public void rollback(StoreContext storeContext)
diff --git a/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java b/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
index 40f5970cac..df7cecc940 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
@@ -68,16 +68,6 @@ public class UnacknowledgedMessage
         entry.getMessage().decrementReference(storeContext);
     }
 
-    public void restoreTransientMessageData() throws AMQException
-    {
-        entry.getMessage().restoreTransientMessageData();
-    }
-
-    public void clearTransientMessageData()
-    {
-        entry.getMessage().clearTransientMessageData();
-    }
-
     public AMQMessage getMessage()
     {
         return entry.getMessage();
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
index 5e79ab46b0..dcc2becbc5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
@@ -707,10 +707,6 @@ public class AMQMessage
         _transientMessageData = transientMessageData;
     }
 
-    public void clearTransientMessageData()
-    {
-        _transientMessageData = null;
-    }
 
     public String toString()
     {