summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2009-12-08 04:06:59 +0000
committerRobert Gemmell <robbie@apache.org>2009-12-08 04:06:59 +0000
commitcb024205bd5defee9bb33f3a28b513ee7f54cbdf (patch)
tree5eed99fcaa501744e1be7e098a7abd24eb2dc551
parent10adf40dcbe9378662b365de0ac57c57296d026b (diff)
downloadqpid-python-cb024205bd5defee9bb33f3a28b513ee7f54cbdf.tar.gz
QPID-2250: Remove requirement for message persistence and queue durability from the copy process
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@888251 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java34
1 files changed, 15 insertions, 19 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index b4cebda09a..6915850376 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -1037,30 +1037,26 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener
{
final ServerMessage message = entry.getMessage();
- if (message.isPersistent() && toQueue.isDurable())
+ txn.enqueue(toQueue, message, new ServerTransaction.Action()
{
-
- txn.enqueue(toQueue, message, new ServerTransaction.Action()
+ public void postCommit()
+ {
+ try
{
- public void postCommit()
- {
- try
- {
- toQueue.enqueue(message);
- }
- catch (AMQException e)
- {
- throw new RuntimeException(e);
- }
- }
+ toQueue.enqueue(message);
+ }
+ catch (AMQException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
- public void onRollback()
- {
+ public void onRollback()
+ {
- }
- });
+ }
+ });
- }
}
}