diff options
2 files changed, 10 insertions, 6 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java index 9f7c74ba5e..65235ba9b9 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java +++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java @@ -79,9 +79,7 @@ public class AMQProtocolSessionMBean extends AMQManagedObject implements Managed private String _name = null; // openmbean data types for representing the channel attributes - private static final String[] _channelAtttibuteNames = - { "Channel Id", "Transactional", "Default Queue", "Unacknowledged Message Count" }; - private static final String[] _indexNames = { _channelAtttibuteNames[0] }; + private static final OpenType[] _channelAttributeTypes = { SimpleType.INTEGER, SimpleType.BOOLEAN, SimpleType.STRING, SimpleType.INTEGER }; private static CompositeType _channelType = null; // represents the data type for channel data @@ -119,9 +117,9 @@ public class AMQProtocolSessionMBean extends AMQManagedObject implements Managed private static void init() throws OpenDataException { _channelType = - new CompositeType("Channel", "Channel Details", _channelAtttibuteNames, _channelAtttibuteNames, + new CompositeType("Channel", "Channel Details", COMPOSITE_ITEM_NAMES, COMPOSITE_ITEM_DESCRIPTIONS, _channelAttributeTypes); - _channelsType = new TabularType("Channels", "Channels", _channelType, _indexNames); + _channelsType = new TabularType("Channels", "Channels", _channelType, TABULAR_UNIQUE_INDEX); } public String getClientId() @@ -247,7 +245,7 @@ public class AMQProtocolSessionMBean extends AMQManagedObject implements Managed channel.getUnacknowledgedMessageMap().size() }; - CompositeData channelData = new CompositeDataSupport(_channelType, _channelAtttibuteNames, itemValues); + CompositeData channelData = new CompositeDataSupport(_channelType, COMPOSITE_ITEM_NAMES, itemValues); channelsList.put(channelData); } diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java index f041965868..d977877f4c 100644 --- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java +++ b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java @@ -42,6 +42,12 @@ public interface ManagedConnection { static final String TYPE = "Connection"; static final int VERSION = 1; + + //TabularType and contained CompositeType key/description information + //For compatibility reasons, DONT MODIFY the existing key values if expanding the set. + String[] COMPOSITE_ITEM_NAMES = {"Channel Id", "Transactional", "Default Queue", "Unacknowledged Message Count"}; + String[] COMPOSITE_ITEM_DESCRIPTIONS = {"Channel Id", "Transactional", "Default Queue", "Unacknowledged Message Count"}; + String[] TABULAR_UNIQUE_INDEX = {COMPOSITE_ITEM_NAMES[0]}; @MBeanAttribute(name = "ClientId", description = "Client Id") String getClientId(); |