Repository: qpid-broker-j
Updated Branches:
  refs/heads/7.0.x 229b7e549 -> de8098430


QPID-8106: [Broker-J] No longer require a active destination when reuniting 
queue/exchanges with their alternate binding

(cherry picked from commit 1dbdd321351400b466b1a23cb5efb8df55e1ab00)


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/de809843
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/de809843
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/de809843

Branch: refs/heads/7.0.x
Commit: de8098430974db2cb1fd31c4044dec25eb6fd108
Parents: 229b7e5
Author: Keith Wall <kw...@apache.org>
Authored: Wed Feb 21 17:03:04 2018 +0000
Committer: Alex Rudyy <oru...@apache.org>
Committed: Thu Feb 22 11:29:55 2018 +0000

----------------------------------------------------------------------
 .../java/org/apache/qpid/server/exchange/AbstractExchange.java     | 2 +-
 .../src/main/java/org/apache/qpid/server/queue/AbstractQueue.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/de809843/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
 
b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index 6227384..6e2c723 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -528,7 +528,7 @@ public abstract class AbstractExchange<T extends 
AbstractExchange<T>>
     {
         if(_alternateBinding != null)
         {
-            _alternateBindingDestination = 
_virtualHost.getAttainedMessageDestination(_alternateBinding.getDestination(), 
false);
+            _alternateBindingDestination = 
getOpenedMessageDestination(_alternateBinding.getDestination());
             if (_alternateBindingDestination != null)
             {
                 _alternateBindingDestination.addReference(this);

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/de809843/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
----------------------------------------------------------------------
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java 
b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 09ec51c..84007cf 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -683,7 +683,7 @@ public abstract class AbstractQueue<X extends 
AbstractQueue<X>>
     {
         if(_alternateBinding != null)
         {
-            _alternateBindingDestination = 
_virtualHost.getAttainedMessageDestination(_alternateBinding.getDestination(), 
false);
+            _alternateBindingDestination = 
getOpenedMessageDestination(_alternateBinding.getDestination());
             if (_alternateBindingDestination != null)
             {
                 _alternateBindingDestination.addReference(this);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to