QPID-2857: address a further 60 or so issues identified by running FindBugs across the Java codebase

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

8 files changed, 78 insertions, 64 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
index b33a83672b..7aeff2561e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
@@ -74,7 +74,7 @@ public abstract class AbstractExchangeMBean<T extends AbstractExchange> extends
                 COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]),
                 COMPOSITE_ITEM_DESCRIPTIONS.toArray(new String[COMPOSITE_ITEM_DESCRIPTIONS.size()]), _bindingItemTypes);
         _bindinglistDataType = new TabularType("Exchange Bindings", "Exchange Bindings for " + getName(),
-                                               _bindingDataType, TABULAR_UNIQUE_INDEX);
+                                               _bindingDataType, TABULAR_UNIQUE_INDEX.toArray(new String[TABULAR_UNIQUE_INDEX.size()]));
     }
 
     public ManagedObject getParentObject()
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java
index 2c7985b480..66c9b5b552 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java
@@ -56,9 +56,10 @@ final class HeadersExchangeMBean extends AbstractExchangeMBean<HeadersExchange>
         _bindingItemTypes[1] = SimpleType.STRING;
         _bindingItemTypes[2] = new ArrayType(1, SimpleType.STRING);
         _bindingDataType = new CompositeType("Exchange Binding", "Queue name and header bindings",
-                HEADERS_COMPOSITE_ITEM_NAMES, HEADERS_COMPOSITE_ITEM_DESC, _bindingItemTypes);
+                HEADERS_COMPOSITE_ITEM_NAMES.toArray(new String[HEADERS_COMPOSITE_ITEM_NAMES.size()]), 
+                HEADERS_COMPOSITE_ITEM_DESC.toArray(new String[HEADERS_COMPOSITE_ITEM_DESC.size()]), _bindingItemTypes);
         _bindinglistDataType = new TabularType("Exchange Bindings", "List of exchange bindings for " + getName(),
-                                               _bindingDataType, HEADERS_TABULAR_UNIQUE_INDEX);
+                                               _bindingDataType, HEADERS_TABULAR_UNIQUE_INDEX.toArray(new String[HEADERS_TABULAR_UNIQUE_INDEX.size()]));
     }
 
     public TabularData bindings() throws OpenDataException
@@ -85,7 +86,8 @@ final class HeadersExchangeMBean extends AbstractExchangeMBean<HeadersExchange>
 
 
             Object[] bindingItemValues = {count++, queueName, mappingList.toArray(new String[0])};
-            CompositeData bindingData = new CompositeDataSupport(_bindingDataType, HEADERS_COMPOSITE_ITEM_NAMES, bindingItemValues);
+            CompositeData bindingData = new CompositeDataSupport(_bindingDataType, 
+                    HEADERS_COMPOSITE_ITEM_NAMES.toArray(new String[HEADERS_COMPOSITE_ITEM_NAMES.size()]), bindingItemValues);
             bindingList.put(bindingData);
         }
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java b/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
index 258552f2f5..a823fb7cb1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
@@ -95,10 +95,13 @@ public class LoggingManagementMBean extends AMQManagedObject implements LoggingM
             OpenType[] loggerLevelItemTypes = new OpenType[]{SimpleType.STRING, SimpleType.STRING};
 
             _loggerLevelCompositeType = new CompositeType("LoggerLevelList", "Logger Level Data", 
-                                                         COMPOSITE_ITEM_NAMES, COMPOSITE_ITEM_DESCRIPTIONS, loggerLevelItemTypes);
+                                                         COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]),
+                                                         COMPOSITE_ITEM_DESCRIPTIONS.toArray(new String[COMPOSITE_ITEM_DESCRIPTIONS.size()]),
+                                                         loggerLevelItemTypes);
 
             _loggerLevelTabularType = new TabularType("LoggerLevel", "List of loggers with levels",
-                                                       _loggerLevelCompositeType, TABULAR_UNIQUE_INDEX);
+                                                       _loggerLevelCompositeType, 
+                                                       TABULAR_UNIQUE_INDEX.toArray(new String[TABULAR_UNIQUE_INDEX.size()]));
         }
         catch (OpenDataException e)
         {
@@ -198,7 +201,8 @@ public class LoggingManagementMBean extends AMQManagedObject implements LoggingM
                 level = logger.getEffectiveLevel().toString();
 
                 Object[] itemData = {loggerName, level};
-                CompositeData loggerData = new CompositeDataSupport(_loggerLevelCompositeType, COMPOSITE_ITEM_NAMES, itemData);
+                CompositeData loggerData = new CompositeDataSupport(_loggerLevelCompositeType, 
+                        COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]), itemData);
                 loggerLevelList.put(loggerData);
             }
         }
@@ -536,7 +540,8 @@ public class LoggingManagementMBean extends AMQManagedObject implements LoggingM
                 try
                 {
                     Object[] itemData = {loggerName, level.toUpperCase()};
-                    CompositeData loggerData = new CompositeDataSupport(_loggerLevelCompositeType, COMPOSITE_ITEM_NAMES, itemData);
+                    CompositeData loggerData = new CompositeDataSupport(_loggerLevelCompositeType, 
+                            COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]), itemData);
                     loggerLevelList.put(loggerData);
                 }
                 catch (OpenDataException e)
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 6d3a41fbe9..f4f2cab2c2 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
@@ -118,9 +118,9 @@ public class AMQProtocolSessionMBean extends AMQManagedObject implements Managed
     private static void init() throws OpenDataException
     {
         _channelType =
-            new CompositeType("Channel", "Channel Details", COMPOSITE_ITEM_NAMES, COMPOSITE_ITEM_DESCRIPTIONS,
-                _channelAttributeTypes);
-        _channelsType = new TabularType("Channels", "Channels", _channelType, TABULAR_UNIQUE_INDEX);
+            new CompositeType("Channel", "Channel Details", COMPOSITE_ITEM_NAMES_DESC.toArray(new String[COMPOSITE_ITEM_NAMES_DESC.size()]),
+                    COMPOSITE_ITEM_NAMES_DESC.toArray(new String[COMPOSITE_ITEM_NAMES_DESC.size()]), _channelAttributeTypes);
+        _channelsType = new TabularType("Channels", "Channels", _channelType, TABULAR_UNIQUE_INDEX.toArray(new String[TABULAR_UNIQUE_INDEX.size()]));
     }
 
     public String getClientId()
@@ -256,7 +256,8 @@ public class AMQProtocolSessionMBean extends AMQManagedObject implements Managed
                     channel.getUnacknowledgedMessageMap().size(), channel.getBlocking()
                 };
 
-            CompositeData channelData = new CompositeDataSupport(_channelType, COMPOSITE_ITEM_NAMES, itemValues);
+            CompositeData channelData = new CompositeDataSupport(_channelType, 
+                    COMPOSITE_ITEM_NAMES_DESC.toArray(new String[COMPOSITE_ITEM_NAMES_DESC.size()]), itemValues);
             channelsList.put(channelData);
         }
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
index 32b71a554b..b5294b6d2f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
@@ -128,7 +128,8 @@ public class AMQQueueMBean extends AMQManagedObject implements ManagedQueue, Que
         _msgContentAttributeTypes[2] = SimpleType.STRING; // For Encoding
         _msgContentAttributeTypes[3] = new ArrayType(1, SimpleType.BYTE); // For message content
         _msgContentType = new CompositeType("Message Content", "AMQ Message Content",
-                    VIEW_MSG_CONTENT_COMPOSITE_ITEM_NAMES, VIEW_MSG_CONTENT_COMPOSITE_ITEM_DESCRIPTIONS,
+                    VIEW_MSG_CONTENT_COMPOSITE_ITEM_NAMES_DESC.toArray(new String[VIEW_MSG_CONTENT_COMPOSITE_ITEM_NAMES_DESC.size()]),
+                    VIEW_MSG_CONTENT_COMPOSITE_ITEM_NAMES_DESC.toArray(new String[VIEW_MSG_CONTENT_COMPOSITE_ITEM_NAMES_DESC.size()]),
                     _msgContentAttributeTypes);
 
         _msgAttributeTypes[0] = SimpleType.LONG; // For message id
@@ -137,10 +138,11 @@ public class AMQQueueMBean extends AMQManagedObject implements ManagedQueue, Que
         _msgAttributeTypes[3] = SimpleType.BOOLEAN; // For redelivered
         _msgAttributeTypes[4] = SimpleType.LONG; // For queue position
 
-        _messageDataType = new CompositeType("Message", "AMQ Message", VIEW_MSGS_COMPOSITE_ITEM_NAMES,
-                                VIEW_MSGS_COMPOSITE_ITEM_DESCRIPTIONS, _msgAttributeTypes);
+        _messageDataType = new CompositeType("Message", "AMQ Message", 
+                VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC.toArray(new String[VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC.size()]),
+                VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC.toArray(new String[VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC.size()]), _msgAttributeTypes);
         _messagelistDataType = new TabularType("Messages", "List of messages", _messageDataType,
-                                                VIEW_MSGS_TABULAR_UNIQUE_INDEX);
+                                                VIEW_MSGS_TABULAR_UNIQUE_INDEX.toArray(new String[VIEW_MSGS_TABULAR_UNIQUE_INDEX.size()]));
     }
 
     public String getObjectInstanceName()
@@ -410,7 +412,9 @@ public class AMQQueueMBean extends AMQManagedObject implements ManagedQueue, Que
 
         Object[] itemValues = { msgId, mimeType, encoding, msgContent.toArray(new Byte[0]) };
 
-        return new CompositeDataSupport(_msgContentType, VIEW_MSG_CONTENT_COMPOSITE_ITEM_NAMES, itemValues);
+        return new CompositeDataSupport(_msgContentType,
+                VIEW_MSG_CONTENT_COMPOSITE_ITEM_NAMES_DESC.toArray(
+                        new String[VIEW_MSG_CONTENT_COMPOSITE_ITEM_NAMES_DESC.size()]), itemValues);
 
     }
 
@@ -456,16 +460,17 @@ public class AMQQueueMBean extends AMQManagedObject implements ManagedQueue, Que
                 long position = startPosition + i;
                 final QueueEntry queueEntry = list.get(i);
                 ServerMessage serverMsg = queueEntry.getMessage();
+                
+                String[] headerAttributes = null;
+                Object[] itemValues = null;
+                
                 if(serverMsg instanceof AMQMessage)
                 {
                     AMQMessage msg = (AMQMessage) serverMsg;
                     ContentHeaderBody headerBody = msg.getContentHeaderBody();
                     // Create header attributes list
-                    String[] headerAttributes = getMessageHeaderProperties(headerBody);
-                    Object[] itemValues = {msg.getMessageId(), headerAttributes, headerBody.bodySize, queueEntry.isRedelivered(), position};
-                    CompositeData messageData = new CompositeDataSupport(_messageDataType, VIEW_MSGS_COMPOSITE_ITEM_NAMES, itemValues);
-                    _messageList.put(messageData);
-
+                    headerAttributes = getMessageHeaderProperties(headerBody);
+                    itemValues = new Object[]{msg.getMessageId(), headerAttributes, headerBody.bodySize, queueEntry.isRedelivered(), position};
                 }
                 else if(serverMsg instanceof MessageTransferMessage)
                 {
@@ -473,19 +478,19 @@ public class AMQQueueMBean extends AMQManagedObject implements ManagedQueue, Que
                     MessageTransferMessage msg = (MessageTransferMessage) serverMsg;
 
                     // Create header attributes list
-                    String[] headerAttributes = getMessageTransferMessageHeaderProps(msg);
-                    Object[] itemValues = {msg.getMessageNumber(), headerAttributes, msg.getSize(), queueEntry.isRedelivered(), position};
-                    CompositeData messageData = new CompositeDataSupport(_messageDataType, VIEW_MSGS_COMPOSITE_ITEM_NAMES, itemValues);
-                    _messageList.put(messageData);
+                    headerAttributes = getMessageTransferMessageHeaderProps(msg);
+                    itemValues = new Object[]{msg.getMessageNumber(), headerAttributes, msg.getSize(), queueEntry.isRedelivered(), position};
                 }
                 else
                 {
                     //unknown message
-                    String[] headerAttributes = new String[]{"N/A"};
-                    Object[] itemValues = { serverMsg.getMessageNumber(), headerAttributes, serverMsg.getSize(), queueEntry.isRedelivered(), position};
-                    CompositeData messageData = new CompositeDataSupport(_messageDataType, VIEW_MSGS_COMPOSITE_ITEM_NAMES, itemValues);
-                    _messageList.put(messageData);
+                    headerAttributes = new String[]{"N/A"};
+                    itemValues = new Object[]{serverMsg.getMessageNumber(), headerAttributes, serverMsg.getSize(), queueEntry.isRedelivered(), position};
                 }
+                
+                CompositeData messageData = new CompositeDataSupport(_messageDataType, 
+                        VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC.toArray(new String[VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC.size()]), itemValues);
+                _messageList.put(messageData);
             }
         }
         catch (AMQException e)
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/management/AMQUserManagementMBean.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/management/AMQUserManagementMBean.java
index a9bee4466f..ee4336055b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/management/AMQUserManagementMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/management/AMQUserManagementMBean.java
@@ -85,9 +85,10 @@ public class AMQUserManagementMBean extends AMQManagedObject implements UserMana
         try
         {
             _userDataType =
-                    new CompositeType("User", "User Data", COMPOSITE_ITEM_NAMES, COMPOSITE_ITEM_DESCRIPTIONS, userItemTypes);
+                    new CompositeType("User", "User Data", COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]),
+                            COMPOSITE_ITEM_DESCRIPTIONS.toArray(new String[COMPOSITE_ITEM_DESCRIPTIONS.size()]), userItemTypes);
 
-            _userlistDataType = new TabularType("Users", "List of users", _userDataType, TABULAR_UNIQUE_INDEX);
+            _userlistDataType = new TabularType("Users", "List of users", _userDataType, TABULAR_UNIQUE_INDEX.toArray(new  String[TABULAR_UNIQUE_INDEX.size()]));
         }
         catch (OpenDataException e)
         {
@@ -326,7 +327,7 @@ public class AMQUserManagementMBean extends AMQManagedObject implements UserMana
                 }
 
                 Object[] itemData = {user.getName(), read, write, admin};
-                CompositeData messageData = new CompositeDataSupport(_userDataType, COMPOSITE_ITEM_NAMES, itemData);
+                CompositeData messageData = new CompositeDataSupport(_userDataType, COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]), itemData);
                 userList.put(messageData);
             }
         }
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
index fe420d906d..2d25a769aa 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
@@ -20,6 +20,9 @@
  */
 package org.apache.qpid.server.logging.management;
 
+import static org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_LEVEL;
+import static org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_NAME;
+
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
@@ -45,12 +48,9 @@ public class LoggingManagementMBeanTest extends InternalBrokerBaseCase
     private static final String TEST_LOGGER_CHILD1 = "LoggingManagementMBeanTestLogger.child1";
     private static final String TEST_LOGGER_CHILD2 = "LoggingManagementMBeanTestLogger.child2";
 
-    private static final String CATEGORY_PRIORITY = "LogManMBeanTest.category.priority";
-    private static final String CATEGORY_LEVEL = "LogManMBeanTest.category.level";
-    private static final String LOGGER_LEVEL = "LogManMBeanTest.logger.level";
-    
-    private static final String NAME_INDEX = LoggingManagement.COMPOSITE_ITEM_NAMES[0];
-    private static final String LEVEL_INDEX = LoggingManagement.COMPOSITE_ITEM_NAMES[1];
+    private static final String TEST_CATEGORY_PRIORITY = "LogManMBeanTest.category.priority";
+    private static final String TEST_CATEGORY_LEVEL = "LogManMBeanTest.category.level";
+    private static final String TEST_LOGGER_LEVEL = "LogManMBeanTest.logger.level";
 
     private static final String NEWLINE = System.getProperty("line.separator");
 
@@ -101,19 +101,19 @@ public class LoggingManagementMBeanTest extends InternalBrokerBaseCase
             writer.write("  </appender>"+NEWLINE);
 
             //Example of a 'category' with a 'priority'
-            writer.write("  <category additivity=\"true\" name=\"" + CATEGORY_PRIORITY +"\">"+NEWLINE);
+            writer.write("  <category additivity=\"true\" name=\"" + TEST_CATEGORY_PRIORITY +"\">"+NEWLINE);
             writer.write("      <priority value=\"info\"/>"+NEWLINE);
             writer.write("      <appender-ref ref=\"STDOUT\"/>"+NEWLINE);
             writer.write("  </category>"+NEWLINE);
 
             //Example of a 'category' with a 'level'
-            writer.write("  <category additivity=\"true\" name=\"" + CATEGORY_LEVEL +"\">"+NEWLINE);
+            writer.write("  <category additivity=\"true\" name=\"" + TEST_CATEGORY_LEVEL +"\">"+NEWLINE);
             writer.write("      <level value=\"warn\"/>"+NEWLINE);
             writer.write("      <appender-ref ref=\"STDOUT\"/>"+NEWLINE);
             writer.write("  </category>"+NEWLINE);
 
             //Example of a 'logger' with a 'level'
-            writer.write("  <logger additivity=\"true\" name=\"" + LOGGER_LEVEL + "\">"+NEWLINE);
+            writer.write("  <logger additivity=\"true\" name=\"" + TEST_LOGGER_LEVEL + "\">"+NEWLINE);
             writer.write("      <level value=\"error\"/>"+NEWLINE);
             writer.write("      <appender-ref ref=\"STDOUT\"/>"+NEWLINE);
             writer.write("  </logger>"+NEWLINE);
@@ -268,7 +268,7 @@ public class LoggingManagementMBeanTest extends InternalBrokerBaseCase
         for (Object o : records)
         {
             CompositeData data = (CompositeData) o;
-            list.put(data.get(NAME_INDEX).toString(), data.get(LEVEL_INDEX).toString());
+            list.put(data.get(LOGGER_NAME).toString(), data.get(LOGGER_LEVEL).toString());
         }
         
         //check child2 does not exist already
@@ -284,7 +284,7 @@ public class LoggingManagementMBeanTest extends InternalBrokerBaseCase
         for (Object o : records)
         {
             CompositeData data = (CompositeData) o;
-            list.put(data.get(NAME_INDEX).toString(), data.get(LEVEL_INDEX).toString());
+            list.put(data.get(LOGGER_NAME).toString(), data.get(LOGGER_LEVEL).toString());
         }
 
         //verify the parent and child2 loggers are present in returned values
@@ -305,7 +305,7 @@ public class LoggingManagementMBeanTest extends InternalBrokerBaseCase
         for (Object o : records)
         {
             CompositeData data = (CompositeData) o;
-            list.put(data.get(NAME_INDEX).toString(), data.get(LEVEL_INDEX).toString());
+            list.put(data.get(LOGGER_NAME).toString(), data.get(LOGGER_LEVEL).toString());
         }
 
         //check child2's effective level is now "warn"
@@ -332,30 +332,30 @@ public class LoggingManagementMBeanTest extends InternalBrokerBaseCase
         for (Object o : records)
         {
             CompositeData data = (CompositeData) o;
-            list.put(data.get(NAME_INDEX).toString(), data.get(LEVEL_INDEX).toString());
+            list.put(data.get(LOGGER_NAME).toString(), data.get(LOGGER_LEVEL).toString());
         }
 
         //check the 3 different types of logger definition are successfully retrieved before update
         assertTrue("Wrong number of items in returned list", list.size() == 3);
-        assertTrue(CATEGORY_PRIORITY + " logger was not in the returned list", list.containsKey(CATEGORY_PRIORITY));
-        assertTrue(CATEGORY_LEVEL + " logger was not in the returned list", list.containsKey(CATEGORY_LEVEL));
-        assertTrue(LOGGER_LEVEL + " logger was not in the returned list", list.containsKey(LOGGER_LEVEL));
+        assertTrue(TEST_CATEGORY_PRIORITY + " logger was not in the returned list", list.containsKey(TEST_CATEGORY_PRIORITY));
+        assertTrue(TEST_CATEGORY_LEVEL + " logger was not in the returned list", list.containsKey(TEST_CATEGORY_LEVEL));
+        assertTrue(TEST_LOGGER_LEVEL + " logger was not in the returned list", list.containsKey(TEST_LOGGER_LEVEL));
 
         //check that their level is as expected
-        assertTrue(CATEGORY_PRIORITY + " logger's level was incorrect", list.get(CATEGORY_PRIORITY).equalsIgnoreCase("info"));
-        assertTrue(CATEGORY_LEVEL + " logger's level was incorrect", list.get(CATEGORY_LEVEL).equalsIgnoreCase("warn"));
-        assertTrue(LOGGER_LEVEL + " logger's level was incorrect", list.get(LOGGER_LEVEL).equalsIgnoreCase("error"));
+        assertTrue(TEST_CATEGORY_PRIORITY + " logger's level was incorrect", list.get(TEST_CATEGORY_PRIORITY).equalsIgnoreCase("info"));
+        assertTrue(TEST_CATEGORY_LEVEL + " logger's level was incorrect", list.get(TEST_CATEGORY_LEVEL).equalsIgnoreCase("warn"));
+        assertTrue(TEST_LOGGER_LEVEL + " logger's level was incorrect", list.get(TEST_LOGGER_LEVEL).equalsIgnoreCase("error"));
 
         //increase their levels a notch to test the 3 different types of logger definition are successfully updated
         //change the category+priority to warn
-        assertTrue("failed to set new level", lm.setConfigFileLoggerLevel(CATEGORY_PRIORITY, "warn"));
+        assertTrue("failed to set new level", lm.setConfigFileLoggerLevel(TEST_CATEGORY_PRIORITY, "warn"));
         //change the category+level to error
-        assertTrue("failed to set new level", lm.setConfigFileLoggerLevel(CATEGORY_LEVEL, "error"));
+        assertTrue("failed to set new level", lm.setConfigFileLoggerLevel(TEST_CATEGORY_LEVEL, "error"));
         //change the logger+level to trace
-        assertTrue("failed to set new level", lm.setConfigFileLoggerLevel(LOGGER_LEVEL, "trace"));
+        assertTrue("failed to set new level", lm.setConfigFileLoggerLevel(TEST_LOGGER_LEVEL, "trace"));
 
         //try an invalid level
-        assertFalse("Use of an invalid logger level was successfull", lm.setConfigFileLoggerLevel(LOGGER_LEVEL, "made.up.level"));
+        assertFalse("Use of an invalid logger level was successfull", lm.setConfigFileLoggerLevel(TEST_LOGGER_LEVEL, "made.up.level"));
 
         //try an invalid logger name
         assertFalse("Use of an invalid logger name was successfull", lm.setConfigFileLoggerLevel("made.up.logger.name", "info"));
@@ -367,19 +367,19 @@ public class LoggingManagementMBeanTest extends InternalBrokerBaseCase
         for (Object o : records)
         {
             CompositeData data = (CompositeData) o;
-            list.put(data.get(NAME_INDEX).toString(), data.get(LEVEL_INDEX).toString());
+            list.put(data.get(LOGGER_NAME).toString(), data.get(LOGGER_LEVEL).toString());
         }
 
         //check the 3 different types of logger definition are successfully retrieved after update
         assertTrue("Wrong number of items in returned list", list.size() == 3);
-        assertTrue(CATEGORY_PRIORITY + " logger was not in the returned list", list.containsKey(CATEGORY_PRIORITY));
-        assertTrue(CATEGORY_LEVEL + " logger was not in the returned list", list.containsKey(CATEGORY_LEVEL));
-        assertTrue(LOGGER_LEVEL + " logger was not in the returned list", list.containsKey(LOGGER_LEVEL));
+        assertTrue(TEST_CATEGORY_PRIORITY + " logger was not in the returned list", list.containsKey(TEST_CATEGORY_PRIORITY));
+        assertTrue(TEST_CATEGORY_LEVEL + " logger was not in the returned list", list.containsKey(TEST_CATEGORY_LEVEL));
+        assertTrue(TEST_LOGGER_LEVEL + " logger was not in the returned list", list.containsKey(TEST_LOGGER_LEVEL));
 
         //check that their level is as expected after the changes
-        assertTrue(CATEGORY_PRIORITY + " logger's level was incorrect", list.get(CATEGORY_PRIORITY).equalsIgnoreCase("warn"));
-        assertTrue(CATEGORY_LEVEL + " logger's level was incorrect", list.get(CATEGORY_LEVEL).equalsIgnoreCase("error"));
-        assertTrue(LOGGER_LEVEL + " logger's level was incorrect", list.get(LOGGER_LEVEL).equalsIgnoreCase("trace"));
+        assertTrue(TEST_CATEGORY_PRIORITY + " logger's level was incorrect", list.get(TEST_CATEGORY_PRIORITY).equalsIgnoreCase("warn"));
+        assertTrue(TEST_CATEGORY_LEVEL + " logger's level was incorrect", list.get(TEST_CATEGORY_LEVEL).equalsIgnoreCase("error"));
+        assertTrue(TEST_LOGGER_LEVEL + " logger's level was incorrect", list.get(TEST_LOGGER_LEVEL).equalsIgnoreCase("trace"));
     }
     
     public void testGetAndSetConfigFileRootLoggerLevel() throws Exception
diff --git a/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java b/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
index a3ad25934c..4df051edb5 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
@@ -95,7 +95,7 @@ public class AMQProtocolSessionMBeanTest extends InternalBrokerBaseCase
         _protocolSession.addChannel(channel4);
         channel4.setDefaultQueue(queue);
         
-        final String blocking = ManagedConnection.COMPOSITE_ITEM_NAMES[4];
+        final String blocking = ManagedConnection.FLOW_BLOCKED;
         TabularData channels = _mbean.channels();
         CompositeData chan4result = channels.get(new Integer[]{4});
         assertNotNull(chan4result);