You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ce...@apache.org on 2013/01/27 22:44:56 UTC
svn commit: r1439193 - in /activemq/trunk:
activemq-broker/src/main/java/org/apache/activemq/broker/jmx/
activemq-web-console/src/main/webapp/
Author: ceposta
Date: Sun Jan 27 21:44:55 2013
New Revision: 1439193
URL: http://svn.apache.org/viewvc?rev=1439193&view=rev
Log:
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
Modified:
activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java
activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java
activemq/trunk/activemq-web-console/src/main/webapp/queueConsumers.jsp
Modified: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java?rev=1439193&r1=1439192&r2=1439193&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java (original)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionView.java Sun Jan 27 21:44:55 2013
@@ -209,6 +209,15 @@ public class SubscriptionView implements
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.
Modified: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java?rev=1439193&r1=1439192&r2=1439193&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java (original)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java Sun Jan 27 21:44:55 2013
@@ -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
*/
Modified: activemq/trunk/activemq-web-console/src/main/webapp/queueConsumers.jsp
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/queueConsumers.jsp?rev=1439193&r1=1439192&r2=1439193&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/queueConsumers.jsp (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/queueConsumers.jsp Sun Jan 27 21:44:55 2013
@@ -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>