Channel is not an MBean. The getObjectName is removed. The SessionMBean is updated accordingly.

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

2 files changed, 4 insertions, 43 deletions

diff --git a/java/broker/src/org/apache/qpid/server/AMQChannel.java b/java/broker/src/org/apache/qpid/server/AMQChannel.java
index 25eb49c9c9..42fa242d30 100644
--- a/java/broker/src/org/apache/qpid/server/AMQChannel.java
+++ b/java/broker/src/org/apache/qpid/server/AMQChannel.java
@@ -36,8 +36,6 @@ import org.apache.qpid.server.store.MessageStore;
 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;
@@ -663,15 +661,6 @@ public class AMQChannel
         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)
     {
         _defaultQueue = queue;
diff --git a/java/broker/src/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java b/java/broker/src/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
index 44ab9127ff..451f2bcf8d 100644
--- a/java/broker/src/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
+++ b/java/broker/src/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
@@ -49,10 +49,8 @@ import org.apache.qpid.server.state.AMQStateManager;
 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 @@ public class AMQMinaProtocolSession implements AMQProtocolSession,
 
     private boolean _closed;
 
-    private long _maxNoOfChannels;
+    private long _maxNoOfChannels = 1000;
     
     /* AMQP Version for this session */
     
@@ -129,34 +127,21 @@ public class AMQMinaProtocolSession implements AMQProtocolSession,
          * 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 @@ public class AMQMinaProtocolSession implements AMQProtocolSession,
             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()};