Fix for https://issues.apache.org/jira/browse/AMQ-4272 updated queueConsumers.jsp to only allow the link to connection page for connections directly to the broker, but go to network.jsp for bridge consumers

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439193 13f79535-47bb-0310-9956-ffa450edef68

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java

@@ -209,6 +209,15 @@ public class SubscriptionView implements SubscriptionViewMBean {
         return true;
     }
 
+    @Override
+    public boolean isNetwork() {
+        ConsumerInfo info = getConsumerInfo();
+        if (info != null) {
+            return info.isNetworkSubscription();
+        }
+        return false;
+    }
+
     /**
      * The subscription should release as may references as it can to help the
      * garbage collector reclaim memory.

activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java

@@ -90,6 +90,9 @@ public interface SubscriptionViewMBean {
     @MBeanInfo("Subscription is active (connected and receiving messages).")
     boolean isActive();
 
+    @MBeanInfo("Subscription was created by a demand-forwarding network bridge")
+    boolean isNetwork();
+
     /**
      * @return number of messages pending delivery
      */

activemq-web-console/src/main/webapp/queueConsumers.jsp

@@ -52,9 +52,16 @@
 <c:forEach items="${requestContext.queueConsumerQuery.consumers}" var="row">
 <tr>
 	<td>
-		<a href="connection.jsp?connectionID=${row.clientId}">${row.clientId}</a><br/>
-	    ${row.connectionId}</a>
-	</td>
+        <c:choose>
+            <c:when test="${row.network}">
+                <a href="network.jsp">${row.clientId}</a><br/>
+            </c:when>
+            <c:otherwise>
+                <a href="connection.jsp?connectionID=${row.clientId}">${row.clientId}</a><br/>
+            </c:otherwise>
+        </c:choose>
+            ${row.connectionId}</a>
+    </td>
 	<td>${row.sessionId}</td>
 	<td>${row.selector}</td>
 	<td>${row.enqueueCounter}</td>