3.1.x branch created and following issues fixed.

wso2/product-ei#77 wso2/product-ei#79
wso2 · Feb 16, 2017 · 64d0bfb · 64d0bfb
1 parent cf78803
commit 64d0bfb
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/modules/andes-core/broker/src/main/java/org/wso2/andes/kernel/AndesConstants.java b/modules/andes-core/broker/src/main/java/org/wso2/andes/kernel/AndesConstants.java
@@ -35,4 +35,9 @@ public class AndesConstants {
      */
     public static final String TENANT_SEPARATOR = "/";
 
+    /**
+     * The prefix which distinguishes a durable subscription.
+     */
+    public static final String DURABLE_SUBSCRIPTION_QUEUE_PREFIX = "carbon:";
+
 }
diff --git a/...in/java/org/wso2/andes/server/information/management/QueueManagementInformationMBean.java b/...in/java/org/wso2/andes/server/information/management/QueueManagementInformationMBean.java
@@ -527,7 +527,7 @@ public CompositeData[] browseQueue(
                         .getNextNMessageMetadataFromQueue(queueName, nextMsgId, maxMsgCount);
             } else {
                 nextNMessageMetadataFromQueue = Andes.getInstance()
-                        .getNextNMessageMetadataFromDLC(queueName, 0, maxMsgCount);
+                        .getNextNMessageMetadataFromDLC(queueName, nextMsgId, maxMsgCount);
             }
 
             return getDisplayableMetaData(nextNMessageMetadataFromQueue, true);

diff --git a/modules/andes-core/broker/src/main/java/org/wso2/andes/server/queue/DLCQueueUtils.java b/modules/andes-core/broker/src/main/java/org/wso2/andes/server/queue/DLCQueueUtils.java
@@ -57,8 +57,13 @@ public class DLCQueueUtils {
     public static String identifyTenantInformationAndGenerateDLCString(String queueName) {
         String destinationString;
 
+        //The Queue is in the tenant realm
         if (queueName.contains(AndesConstants.TENANT_SEPARATOR)) {
-            //The Queue is in the tenant realm
+
+            //If the queue is a durable subscription,  we need to remove the prefix 'carbon:' from the DLC queue name
+            if (queueName.contains(AndesConstants.DURABLE_SUBSCRIPTION_QUEUE_PREFIX)) {
+                queueName = queueName.split(":")[1];
+            }
             destinationString = queueName.split(AndesConstants.TENANT_SEPARATOR,
                     2)[0] + AndesConstants.TENANT_SEPARATOR + AndesConstants.DEAD_LETTER_QUEUE_SUFFIX;
         } else {

diff --git a/modules/andes-core/pom.xml b/modules/andes-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.andes</groupId>
         <artifactId>andes-parent</artifactId>
-        <version>3.1.14-SNAPSHOT</version>
+        <version>3.1.x-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/orbit/andes-client/pom.xml b/modules/orbit/andes-client/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.andes</groupId>
         <artifactId>andes-parent</artifactId>
-        <version>3.1.14-SNAPSHOT</version>
+        <version>3.1.x-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/orbit/andes/pom.xml b/modules/orbit/andes/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.andes</groupId>
         <artifactId>andes-parent</artifactId>
-        <version>3.1.14-SNAPSHOT</version>
+        <version>3.1.x-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
     <groupId>org.wso2.andes</groupId>
     <artifactId>andes-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.1.14-SNAPSHOT</version>
+    <version>3.1.x-SNAPSHOT</version>
     <name>Andes</name>
     <description>Andes, Distributed message broker engine</description>
 
@@ -539,7 +539,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <carbon.kernel.version>4.4.12</carbon.kernel.version>
+        <carbon.kernel.version>4.4.13</carbon.kernel.version>
         <project.scm.id>wso2-scm-server</project.scm.id>
         <andes.version>3.1.13</andes.version>
         <commons-cli.version>1.0</commons-cli.version>