diff options
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java index 75235c7ef0..589c3a0892 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java @@ -299,6 +299,43 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS vhost.getBindingFactory().addBinding(binding,queue,exchange,null); source.setDistributionMode(StdDistMode.COPY); + if(!isDurable) + { + final String queueName = name; + final AMQQueue tempQueue = queue; + + final Connection_1_0.Task deleteQueueTask = + new Connection_1_0.Task() + { + public void doTask(Connection_1_0 session) + { + if (_vhost.getQueueRegistry().getQueue(queueName) == tempQueue) + { + try + { + tempQueue.delete(); + } + catch (AMQException e) + { + e.printStackTrace(); //TODO. + } + } + } + }; + + getSession().getConnection().addConnectionCloseTask(deleteQueueTask); + + queue.addQueueDeleteTask(new AMQQueue.Task() + { + public void doTask(AMQQueue queue) + { + getSession().getConnection().removeConnectionCloseTask(deleteQueueTask); + } + + + }); + } + qd = new QueueDestination(queue); } catch (AMQSecurityException e) |