From 22700415041aef90d033c0fb86b639741a47a6dd Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Fri, 17 Sep 2010 14:56:47 +0000
Subject: QPID-2857 : Address issues found by running FindBugs against the Java
 codebase

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@998162 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java  | 3 ++-
 .../java/org/apache/qpid/server/exchange/DirectExchangeMBean.java    | 4 +++-
 .../java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java    | 4 +++-
 .../java/org/apache/qpid/server/exchange/TopicExchangeMBean.java     | 5 ++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'java/broker')

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 c69d499674..626ceb5d84 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
@@ -71,7 +71,8 @@ public abstract class AbstractExchangeMBean<T extends AbstractExchange> extends
         _bindingItemTypes[0] = SimpleType.STRING;
         _bindingItemTypes[1] = new ArrayType(1, SimpleType.STRING);
         _bindingDataType = new CompositeType("Exchange Binding", "Binding key and Queue names",
-                COMPOSITE_ITEM_NAMES, COMPOSITE_ITEM_DESCRIPTIONS, _bindingItemTypes);
+                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);
     }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
index 086832c045..94fc44d9c7 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
@@ -67,7 +67,9 @@ final class DirectExchangeMBean extends AbstractExchangeMBean<DirectExchange>
         for(Map.Entry<String, List<String>> entry : bindingMap.entrySet())
         {
             Object[] bindingItemValues = {entry.getKey(), entry.getValue().toArray(new String[0])};
-            CompositeData bindingData = new CompositeDataSupport(_bindingDataType, COMPOSITE_ITEM_NAMES, bindingItemValues);
+            CompositeData bindingData = new CompositeDataSupport(_bindingDataType,
+                    COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]),
+                    bindingItemValues);
             bindingList.put(bindingData);
         }
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
index d5734f76a5..2c85b7f787 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
@@ -58,7 +58,9 @@ final class FanoutExchangeMBean extends AbstractExchangeMBean<FanoutExchange>
         }
 
         Object[] bindingItemValues = {BINDING_KEY_SUBSTITUTE, queueNames.toArray(new String[0])};
-        CompositeData bindingData = new CompositeDataSupport(_bindingDataType, COMPOSITE_ITEM_NAMES, bindingItemValues);
+        CompositeData bindingData = new CompositeDataSupport(_bindingDataType,
+                COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]), 
+                bindingItemValues);
         bindingList.put(bindingData);
 
         return bindingList;
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
index de39822ff7..620c3ce140 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
@@ -64,7 +64,10 @@ final class TopicExchangeMBean extends AbstractExchangeMBean<TopicExchange>
         for(Map.Entry<String, List<String>> entry : bindingData.entrySet())
         {
             Object[] bindingItemValues = {entry.getKey(), entry.getValue().toArray(new String[entry.getValue().size()]) };
-            CompositeData bindingCompositeData = new CompositeDataSupport(_bindingDataType, COMPOSITE_ITEM_NAMES, bindingItemValues);
+            CompositeData bindingCompositeData =
+                    new CompositeDataSupport(_bindingDataType,
+                            COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]), 
+                            bindingItemValues);
             bindingList.put(bindingCompositeData);
         }
 
-- 
cgit v1.2.1