Author: jstrachan
Date: Wed May 3 06:40:37 2006
New Revision: 399301
URL: http://svn.apache.org/viewcvs?rev=399301&view=rev
Log:
switched away from using the MBeans due to strangeness when used in JSP EL on
some JVMs
Modified:
incubator/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/BrokerFacade.java
Modified:
incubator/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/BrokerFacade.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/BrokerFacade.java?rev=399301&r1=399300&r2=399301&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/BrokerFacade.java
(original)
+++
incubator/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/BrokerFacade.java
Wed May 3 06:40:37 2006
@@ -76,6 +76,8 @@
}
// TODO - we should not have to use JMX to implement the following
methods...
+
+ /*
public Collection getQueues() throws Exception {
BrokerView broker = brokerService.getAdminView();
if (broker == null) {
@@ -84,6 +86,15 @@
ObjectName[] queues = broker.getQueues();
return getManagedObjects(queues, QueueViewMBean.class);
}
+ */
+ public Collection getQueues() throws Exception {
+ ManagedRegionBroker broker = getManagedBroker();
+ if (broker == null) {
+ return new ArrayList();
+ }
+ return broker.getQueueRegion().getDestinationMap().values();
+ }
+
public Collection getTopics() throws Exception {
BrokerView broker = brokerService.getAdminView();
@@ -119,10 +130,6 @@
}
/**
- * public Collection getQueues() throws Exception { ManagedRegionBroker
- * broker = getManagedBroker(); if (broker == null) { return new
- * ArrayList(); } return
- * broker.getQueueRegion().getDestinationMap().values(); }
*
*
* public Collection getTopics() throws Exception { ManagedRegionBroker
