You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2008/02/28 13:05:41 UTC
svn commit: r631936 - in
/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server:
ack/TxAck.java ack/UnacknowledgedMessage.java queue/AMQMessage.java
Author: rgodfrey
Date: Thu Feb 28 04:05:16 2008
New Revision: 631936
URL: http://svn.apache.org/viewvc?rev=631936&view=rev
Log:
QPID-818 : Persistent Pub/Sub can get exception on acking message
Modified:
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
Modified: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java?rev=631936&r1=631935&r2=631936&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java Thu Feb 28 04:05:16 2008
@@ -100,10 +100,9 @@
//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 @@
//in memory (persistent changes will be rolled back by store)
for (UnacknowledgedMessage msg : _unacked)
{
- msg.clearTransientMessageData();
msg.getMessage().takeReference();
}
}
@@ -124,11 +122,6 @@
{
//remove the unacked messages from the channels map
_map.remove(_unacked);
- for (UnacknowledgedMessage msg : _unacked)
- {
- msg.clearTransientMessageData();
- }
-
}
public void rollback(StoreContext storeContext)
Modified: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java?rev=631936&r1=631935&r2=631936&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/ack/UnacknowledgedMessage.java Thu Feb 28 04:05:16 2008
@@ -68,16 +68,6 @@
entry.getMessage().decrementReference(storeContext);
}
- public void restoreTransientMessageData() throws AMQException
- {
- entry.getMessage().restoreTransientMessageData();
- }
-
- public void clearTransientMessageData()
- {
- entry.getMessage().clearTransientMessageData();
- }
-
public AMQMessage getMessage()
{
return entry.getMessage();
Modified: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java?rev=631936&r1=631935&r2=631936&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java Thu Feb 28 04:05:16 2008
@@ -707,10 +707,6 @@
_transientMessageData = transientMessageData;
}
- public void clearTransientMessageData()
- {
- _transientMessageData = null;
- }
public String toString()
{