QPID-6079 : Merged revisions 1622961 1623055 from trunk to 0.30

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1623374 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 1 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index c49c2790df..ca89db3849 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -1792,7 +1792,6 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
 
             preSetAlternateExchange();
 
-
             for (Action<? super AMQQueue> task : _deleteTaskList)
             {
                 task.performAction(this);
@@ -2818,10 +2817,18 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         _state = State.ACTIVE;
     }
 
+    @StateTransition(currentState = State.UNINITIALIZED, desiredState = State.DELETED)
+    private void doDeleteBeforeInitialize()
+    {
+        preSetAlternateExchange();
+        _state = State.DELETED;
+    }
+
     @StateTransition(currentState = State.ACTIVE, desiredState = State.DELETED)
     private void doDelete()
     {
         _virtualHost.removeQueue(this);
+        preSetAlternateExchange();
         _state = State.DELETED;
     }