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
commit57d9d61d5fe2cff10b130a03ed08b802b80d43ab (patch)
treeb5d9e07e311d137daf750f171875810fea81b4ef
parent654a63ba915c43e10ec09561ee24f0f478a7228d (diff)
downloadqpid-python-57d9d61d5fe2cff10b130a03ed08b802b80d43ab.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@888251 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java34
1 files changed, 15 insertions, 19 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index b4cebda09a..6915850376 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/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()
+ {
- }
- });
+ }
+ });
- }
}
}