You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2011/06/29 12:11:47 UTC
svn commit: r1141034 -
/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java
Author: dejanb
Date: Wed Jun 29 10:11:47 2011
New Revision: 1141034
URL: http://svn.apache.org/viewvc?rev=1141034&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3381 - connections.jsp double rows
Modified:
activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java
Modified: activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java?rev=1141034&r1=1141033&r2=1141034&view=diff
==============================================================================
--- activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java (original)
+++ activemq/trunk/activemq-web/src/main/java/org/apache/activemq/web/BrokerFacadeSupport.java Wed Jun 29 10:11:47 2011
@@ -22,8 +22,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import javax.management.ObjectName;
-import javax.management.QueryExp;
+import javax.management.*;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
@@ -112,7 +111,8 @@ public abstract class BrokerFacadeSuppor
@SuppressWarnings("unchecked")
public Collection<ConnectionViewMBean> getConnections() throws Exception {
String brokerName = getBrokerName();
- ObjectName query = new ObjectName("org.apache.activemq:BrokerName=" + brokerName + ",Type=Connection,*");
+ ObjectName query = new ObjectName("org.apache.activemq:BrokerName=" + brokerName + ",Type=Connection,ConnectorName=*,Connection=*");
+
Set<ObjectName> queryResult = queryNames(query, null);
return getManagedObjects(queryResult.toArray(new ObjectName[queryResult.size()]), ConnectionViewMBean.class);
}
@@ -121,7 +121,7 @@ public abstract class BrokerFacadeSuppor
public Collection<String> getConnections(String connectorName) throws Exception {
String brokerName = getBrokerName();
ObjectName query = new ObjectName("org.apache.activemq:BrokerName=" + brokerName
- + ",Type=Connection,ConnectorName=" + connectorName + ",*");
+ + ",Type=Connection,ConnectorName=" + connectorName + ",Connection=*");
Set<ObjectName> queryResult = queryNames(query, null);
Collection<String> result = new ArrayList<String>(queryResult.size());
for (ObjectName on : queryResult) {