Merge pull request wso2#739 from sdkottegoda/messages_stored_after_un…

…subscribed [MB-1850] messages stored after durable subscription unsubscribes
pumudu88 · Dec 6, 2016 · 333d1d2 · 333d1d2
2 parents b2c7ee2 + b36420a
commit 333d1d2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/modules/andes-core/broker/src/main/java/org/wso2/andes/kernel/router/TopicMessageRouter.java b/modules/andes-core/broker/src/main/java/org/wso2/andes/kernel/router/TopicMessageRouter.java
@@ -71,7 +71,7 @@ public TopicMessageRouter(String encodedRouterInfo) {
  * @throws AndesException
  */
  public void removeMapping(String bindingKey, StorageQueue queue) throws AndesException {
- if (queue.getBoundSubscriptions().isEmpty() && !queue.isDurable()) {
+ if (queue.getBoundSubscriptions().isEmpty()) {
  List<StorageQueue> boundQueues = routingMap.get(bindingKey);
  if (boundQueues != null && !boundQueues.isEmpty()) {
  boundQueues.remove(queue);