QPID-5993 : Fix more findbugs found issues

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

14 files changed, 81 insertions, 56 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
index fa4e3f21dd..597fc44e4c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
@@ -281,4 +281,10 @@ class HeadersBinding
 
         return true;
     }
+
+    @Override
+    public int hashCode()
+    {
+        return _binding == null ? 0 : _binding.hashCode();
+    }
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
index 6c8945582c..f944821c6f 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
@@ -318,7 +318,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
                 checkCandidate((Class<? extends ConfiguredObject>) interfaceClass, candidates);
             }
         }
-        if(clazz.getSuperclass() != null & ConfiguredObject.class.isAssignableFrom(clazz.getSuperclass()))
+        if(clazz.getSuperclass() != null && ConfiguredObject.class.isAssignableFrom(clazz.getSuperclass()))
         {
             findBestFitInterface((Class<? extends ConfiguredObject>) clazz.getSuperclass(), candidates);
         }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
index 0f4ecb09dc..b0dda69ee6 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
@@ -186,6 +186,7 @@ public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
         ConfiguredObjectRecordConverter converter = new ConfiguredObjectRecordConverter(BrokerModel.getInstance());
 
         Reader reader;
+
         try
         {
             URL url = new URL(initialConfigurationLocation);
@@ -196,9 +197,18 @@ public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
             reader = new FileReader(initialConfigurationLocation);
         }
 
-        Collection<ConfiguredObjectRecord> records = converter.readFromJson(org.apache.qpid.server.model.Broker.class,
-                                                                            systemConfig, reader);
-        return records.toArray(new ConfiguredObjectRecord[records.size()]);
+        try
+        {
+            Collection<ConfiguredObjectRecord> records =
+                    converter.readFromJson(org.apache.qpid.server.model.Broker.class,
+                                           systemConfig, reader);
+            return records.toArray(new ConfiguredObjectRecord[records.size()]);
+        }
+        finally
+        {
+            reader.close();
+        }
+
 
     }
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 545a1d941d..c49c2790df 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -2925,7 +2925,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
                         if(existingPolicy != _exclusive)
                         {
                             ExclusivityPolicy newPolicy = _exclusive;
-                            _exclusive = newPolicy;
+                            _exclusive = existingPolicy;
                             updateExclusivityPolicy(newPolicy);
                         }
                         return true;
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java
index d8f8e4e4b0..2f6f55e042 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/DefinedFileServlet.java
@@ -61,23 +61,24 @@ public class DefinedFileServlet extends HttpServlet
     {
         try (OutputStream output = HttpManagementUtil.getOutputStream(request, response))
         {
-            InputStream fileInput = getClass().getResourceAsStream("/resources/" + _filename);
-
-            if (fileInput != null)
+            try(InputStream fileInput = getClass().getResourceAsStream("/resources/" + _filename))
             {
-                byte[] buffer = new byte[1024];
-                response.setStatus(HttpServletResponse.SC_OK);
-                int read = 0;
+                if (fileInput != null)
+                {
+                    byte[] buffer = new byte[1024];
+                    response.setStatus(HttpServletResponse.SC_OK);
+                    int read = 0;
 
-                while ((read = fileInput.read(buffer)) > 0)
+                    while ((read = fileInput.read(buffer)) > 0)
+                    {
+                        output.write(buffer, 0, read);
+                    }
+                }
+                else
                 {
-                    output.write(buffer, 0, read);
+                    response.sendError(HttpServletResponse.SC_NOT_FOUND, "unknown file: " + _filename);
                 }
             }
-            else
-            {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND, "unknown file: " + _filename);
-            }
         }
     }
 }
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 945645ccb1..35252204ac 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -2101,7 +2101,7 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
 
     void deregisterProducer(long producerId)
     {
-        _producers.remove(new Long(producerId));
+        _producers.remove(producerId);
     }
 
     boolean isInRecovery()
@@ -2935,7 +2935,7 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic
 
     private void registerProducer(long producerId, MessageProducer producer)
     {
-        _producers.put(new Long(producerId), producer);
+        _producers.put(producerId, producer);
     }
 
     /**
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java b/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
index b039d8b005..808b2781c4 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
@@ -20,10 +20,10 @@
  */
 package org.apache.qpid.jms;
 
-import org.apache.qpid.transport.ConnectionSettings;
-
 import java.util.Map;
 
+import org.apache.qpid.transport.ConnectionSettings;
+
 public interface BrokerDetails
 {
 
@@ -104,9 +104,5 @@ public interface BrokerDetails
 
     boolean getBooleanProperty(String propName);
 
-    String toString();
-
-    boolean equals(Object o);
-
     ConnectionSettings buildConnectionSettings();
 }
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java b/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
index 978ad3af7d..9d8509b303 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
@@ -50,7 +50,7 @@ public class ConstantExpression implements Expression
     public static final BooleanConstantExpression TRUE = new BooleanConstantExpression(Boolean.TRUE);
     public static final BooleanConstantExpression FALSE = new BooleanConstantExpression(Boolean.FALSE);
 
-    private Object value;
+    private Object _value;
 
     public static ConstantExpression createFromDecimal(String text)
     {
@@ -64,7 +64,7 @@ public class ConstantExpression implements Expression
         Number value;
         try
         {
-            value = new Long(text);
+            value = Long.valueOf(text);
         }
         catch (NumberFormatException e)
         {
@@ -114,17 +114,17 @@ public class ConstantExpression implements Expression
 
     public ConstantExpression(Object value)
     {
-        this.value = value;
+        this._value = value;
     }
 
     public Object evaluate(FilterableMessage message)
     {
-        return value;
+        return _value;
     }
 
     public Object getValue()
     {
-        return value;
+        return _value;
     }
 
     /**
@@ -132,22 +132,22 @@ public class ConstantExpression implements Expression
      */
     public String toString()
     {
-        if (value == null)
+        if (_value == null)
         {
             return "NULL";
         }
 
-        if (value instanceof Boolean)
+        if (_value instanceof Boolean)
         {
-            return ((Boolean) value) ? "TRUE" : "FALSE";
+            return ((Boolean) _value) ? "TRUE" : "FALSE";
         }
 
-        if (value instanceof String)
+        if (_value instanceof String)
         {
-            return encodeString((String) value);
+            return encodeString((String) _value);
         }
 
-        return value.toString();
+        return _value.toString();
     }
 
     /**
@@ -186,7 +186,7 @@ public class ConstantExpression implements Expression
      */
     public static String encodeString(String s)
     {
-        StringBuffer b = new StringBuffer();
+        StringBuilder b = new StringBuilder();
         b.append('\'');
         for (int i = 0; i < s.length(); i++)
         {
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
index 01af41c2c9..bee89fcc66 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
@@ -20,6 +20,9 @@
  */
 package org.apache.qpid.management.common.sasl;
 
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
@@ -28,8 +31,6 @@ import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.sasl.Sasl;
 import javax.security.sasl.SaslClient;
 import javax.security.sasl.SaslException;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 
 public class PlainSaslClient implements SaslClient
 {
@@ -170,9 +171,10 @@ public class PlainSaslClient implements SaslClient
         clearPassword();
     }
 
-    protected void finalize()
+    protected void finalize() throws Throwable
     {
         clearPassword();
+        super.finalize();
     }
 
     private Object[] getUserInfo() throws SaslException
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
index caee5d481a..3778e39f62 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
@@ -19,12 +19,13 @@
  */
 package org.apache.qpid.management.common.sasl;
 
+import java.io.IOException;
+
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
-import java.io.IOException;
 
 public class UserPasswordCallbackHandler implements CallbackHandler
 {
@@ -70,8 +71,9 @@ public class UserPasswordCallbackHandler implements CallbackHandler
         }
     }
 
-    protected void finalize()
+    protected void finalize() throws Throwable
     {
         clearPassword();
+        super.finalize();
     }
 }
diff --git a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
index 314ef70144..5f12fa9dfc 100644
--- a/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
+++ b/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
@@ -20,15 +20,16 @@
  */
 package org.apache.qpid.management.common.sasl;
 
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 
 
 public class UsernameHashedPasswordCallbackHandler implements CallbackHandler
@@ -76,9 +77,10 @@ public class UsernameHashedPasswordCallbackHandler implements CallbackHandler
         }
     }
 
-    protected void finalize()
+    protected void finalize() throws Throwable
     {
         clearPassword();
+        super.finalize();
     }
     
     public static char[] getHash(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java
index e0ae137c35..1cb938e915 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/property/NumericGeneratedPropertySupport.java
@@ -102,27 +102,27 @@ public abstract class NumericGeneratedPropertySupport extends GeneratedPropertyS
         Number result = null;
         if (targetType == double.class)
         {
-            result = new Double(value);
+            result = value;
         }
         else if (targetType == float.class)
         {
-            result = new Float(value);
+            result = (float) value;
         }
         else if (targetType == int.class)
         {
-            result = new Integer((int) value);
+            result = (int) value;
         }
         else if (targetType == long.class)
         {
-            result = new Long((long) value);
+            result = (long) value;
         }
         else if (targetType == short.class)
         {
-            result = new Short((short) value);
+            result = (short) value;
         }
         else if (targetType == byte.class)
         {
-            result = new Byte((byte) value);
+            result = (byte) value;
         }
         else
         {
diff --git a/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index 5a3c0182fd..dd58adf935 100644
--- a/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -90,9 +90,9 @@ public class QpidTestCase extends TestCase
                 if (file.exists())
                 {
                     _logger.info("Using exclude file: " + uri);
-                    try
+                    try(FileReader fileReader = new FileReader(file))
                     {
-                        BufferedReader in = new BufferedReader(new FileReader(file));
+                        BufferedReader in = new BufferedReader(fileReader);
                         String excludedTest = in.readLine();
                         do
                         {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
index fce47f9986..70e1b27fba 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.mock;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.MalformedURLException;
@@ -114,7 +115,10 @@ public class TestBrokerConfiguration
             try
             {
                 URL url = new URL(initialStoreLocation);
-                reader = new InputStreamReader(url.openStream());
+                try(InputStream urlStream = url.openStream())
+                {
+                    reader = new InputStreamReader(urlStream);
+                }
             }
             catch (MalformedURLException e)
             {
@@ -122,6 +126,8 @@ public class TestBrokerConfiguration
             }
 
             Collection<ConfiguredObjectRecord> records = converter.readFromJson(org.apache.qpid.server.model.Broker.class, parentObject, reader);
+            reader.close();
+
             _store = new AbstractMemoryStore(Broker.class){};
 
             ConfiguredObjectRecord[] initialRecords = records.toArray(new ConfiguredObjectRecord[records.size()]);