1 files changed, 3 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index 6b453cbbda..3f6489cb86 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -40,6 +40,7 @@ import org.apache.qpid.server.plugin.ExchangeType;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.BaseQueue;
 import org.apache.qpid.server.queue.QueueRegistry;
+import org.apache.qpid.server.store.DurableConfigurationStoreHelper;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
 import java.util.Collection;
@@ -554,7 +555,7 @@ public abstract class AbstractExchange implements Exchange
 
             if (b.isDurable())
             {
-                _virtualHost.getDurableConfigurationStore().unbindQueue(b);
+                DurableConfigurationStoreHelper.removeBinding(_virtualHost.getDurableConfigurationStore(), b);
             }
             b.logDestruction();
         }
@@ -626,7 +627,7 @@ public abstract class AbstractExchange implements Exchange
 
             if (b.isDurable() && !restore)
             {
-                _virtualHost.getDurableConfigurationStore().bindQueue(b);
+                DurableConfigurationStoreHelper.createBinding(_virtualHost.getDurableConfigurationStore(), b);
             }
 
             queue.addQueueDeleteTask(b);