Author: bhupendrab
Date: Wed Nov 1 08:06:40 2006
New Revision: 469954
URL: http://svn.apache.org/viewvc?view=rev&rev=469954
Log:
Channel is not an MBean. The getObjectName is removed. The SessionMBean is
updated accordingly.
Modified:
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/AMQChannel.java
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
Modified:
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/AMQChannel.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/AMQChannel.java?view=diff&rev=469954&r1=469953&r2=469954
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/AMQChannel.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/AMQChannel.java
Wed Nov 1 08:06:40 2006
@@ -36,8 +36,6 @@
import org.apache.qpid.server.txn.TxnBuffer;
import org.apache.qpid.server.txn.TxnOp;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
@@ -661,15 +659,6 @@
sb.append(", prefetch marks: ").append(_prefetch_LowWaterMark);
sb.append("/").append(_prefetch_HighWaterMark);
return sb.toString();
- }
-
- public ObjectName getObjectName()
- throws MalformedObjectNameException
- {
- StringBuilder sb = new StringBuilder(30);
- sb.append("Channel:id=").append(_channelId);
- sb.append(",transaction mode=").append(_transactional);
- return new ObjectName(sb.toString());
}
public void setDefaultQueue(AMQQueue queue)
Modified:
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java?view=diff&rev=469954&r1=469953&r2=469954
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
Wed Nov 1 08:06:40 2006
@@ -49,10 +49,8 @@
import javax.management.JMException;
import javax.management.MBeanException;
import javax.management.MBeanNotificationInfo;
-import javax.management.MalformedObjectNameException;
import javax.management.NotCompliantMBeanException;
import javax.management.Notification;
-import javax.management.ObjectName;
import javax.management.monitor.MonitorNotification;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.CompositeDataSupport;
@@ -103,7 +101,7 @@
private boolean _closed;
- private long _maxNoOfChannels;
+ private long _maxNoOfChannels = 1000;
/* AMQP Version for this session */
@@ -129,34 +127,21 @@
* Represents the channel attributes sent with channel data.
*/
private String[] _channelAtttibuteNames = { "ChannelId",
- "ChannelName",
"Transactional",
"DefaultQueue",
"UnacknowledgedMessageCount"};
private String[] _channelAttributeDescriptions = { "Channel
Identifier",
- "Channel Name",
"is Channel
Transactional?",
"Default Queue
Name",
"Unacknowledged
Message Count"};
private OpenType[] _channelAttributeTypes = { SimpleType.INTEGER,
- SimpleType.OBJECTNAME,
SimpleType.BOOLEAN,
SimpleType.STRING,
SimpleType.INTEGER};
- /**
- * Channels in the list will be indexed according to channelId.
- */
- private String[] _indexNames = { "ChannelId" };
-
- /**
- * represents the data type for channel data.
- */
- private CompositeType _channelType = null;
- /**
- * Datatype for list of channelsType.
- */
- private TabularType _channelsType = null;
+ private String[] _indexNames = { "ChannelId" }; //Channels in the
list will be indexed according to channelId.
+ private CompositeType _channelType = null; // represents the
data type for channel data
+ private TabularType _channelsType = null; // Datatype for list
of channelsType
private TabularDataSupport _channelsList = null;
@MBeanConstructor("Creates an MBean exposing an AMQ Broker Connection")
@@ -283,20 +268,7 @@
for (Map.Entry<Integer, AMQChannel> entry : _channelMap.entrySet())
{
AMQChannel channel = entry.getValue();
- //ManagedChannel channel =
(AMQChannelMBean)amqChannel.getManagedObject();
- ObjectName channelObjectName = null;
-
- try
- {
- channelObjectName = channel.getObjectName();
- }
- catch (MalformedObjectNameException ex)
- {
- _logger.error("Unable to create object name: ", ex);
- }
-
Object[] itemValues = {channel.getChannelId(),
- channelObjectName,
channel.isTransactional(),
(channel.getDefaultQueue() != null) ?
channel.getDefaultQueue().getName() : null,
channel.getUnacknowledgedMessageMap().size()};
