QPID-2857 : Address issues found by running FindBugs against the Java codebase

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

7 files changed, 69 insertions, 48 deletions

diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/Names.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/Names.java
index d3ce711d5d..b60867d9ff 100644
--- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/Names.java
+++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/Names.java
@@ -28,39 +28,39 @@ import javax.xml.namespace.QName;
  */
 public abstract class Names
 {
-    public static String MANAGEMENT_EXCHANGE = "qpid.management";    
-    public static String MANAGEMENT_ROUTING_KEY = "console.#";
+    public static final String MANAGEMENT_EXCHANGE = "qpid.management";
+    public static final String MANAGEMENT_ROUTING_KEY = "console.#";
    
-    public static String MANAGEMENT_QUEUE_PREFIX = "management.";
-    public static String METHOD_REPLY_QUEUE_PREFIX = "reply.";
+    public static final String MANAGEMENT_QUEUE_PREFIX = "management.";
+    public static final String METHOD_REPLY_QUEUE_PREFIX = "reply.";
    
-    public static String AMQ_DIRECT_QUEUE = "amq.direct";
-    public static String AGENT_ROUTING_KEY_PREFIX = "agent.";
-    public static String AGENT_ROUTING_KEY = AGENT_ROUTING_KEY_PREFIX+"1.0";
+    public static final String AMQ_DIRECT_QUEUE = "amq.direct";
+    public static final String AGENT_ROUTING_KEY_PREFIX = "agent.";
+    public static final String AGENT_ROUTING_KEY = AGENT_ROUTING_KEY_PREFIX+"1.0";
 
-    public static String APPLICATION_NAME ="Q-Man";
+    public static final String APPLICATION_NAME ="Q-Man";
     
     // Attributes
-    public static String PACKAGE = "package";
-    public static String CLASS = "class";
-    public static String EVENT = "event";
-    public static String OBJECT_ID="objectId";    
-    public static String BROKER_ID = "brokerId";
-    public static String DOMAIN_NAME = "Q-MAN";
+    public static final String PACKAGE = "package";
+    public static final String CLASS = "class";
+    public static final String EVENT = "event";
+    public static final String OBJECT_ID="objectId";
+    public static final String BROKER_ID = "brokerId";
+    public static final String DOMAIN_NAME = "Q-MAN";
         
-    public static String ARG_COUNT_PARAM_NAME = "argCount";
-    public static String DEFAULT_PARAM_NAME ="default";
+    public static final String ARG_COUNT_PARAM_NAME = "argCount";
+    public static final String DEFAULT_PARAM_NAME ="default";
     
-    public static String NUMBER_VALIDATOR = "org.apache.qpid.management.domain.model.QpidProperty$NumberValidator";
-    public static String STRING_VALIDATOR = "org.apache.qpid.management.domain.model.QpidProperty$StringValidator";
+    public static final String NUMBER_VALIDATOR = "org.apache.qpid.management.domain.model.QpidProperty$NumberValidator";
+    public static final String STRING_VALIDATOR = "org.apache.qpid.management.domain.model.QpidProperty$StringValidator";
     
-    public static String QMAN_CONFIG_OPTION_NAME = "qman-config";
+    public static final String QMAN_CONFIG_OPTION_NAME = "qman-config";
     
-    public static String ADD_BROKER_OPERATION_NAME = "addBroker";
+    public static final String ADD_BROKER_OPERATION_NAME = "addBroker";
     
-    public static String NOT_AVAILABLE = "N.A.";
+    public static final String NOT_AVAILABLE = "N.A.";
     
-    public static ObjectName QPID_EMULATOR_OBJECT_NAME;
+    public static final ObjectName QPID_EMULATOR_OBJECT_NAME;
     static 
     {
 	    try 
@@ -77,7 +77,7 @@ public abstract class Names
 	    }
     }    
     
-    public static ObjectName QMAN_OBJECT_NAME;
+    public static final ObjectName QMAN_OBJECT_NAME;
     static 
     {
 	    try 
@@ -95,11 +95,11 @@ public abstract class Names
     }
     
     // WSDM Stuff
-    public static String NAMESPACE_URI = "http://amqp.apache.org/qpid/management/qman";
+    public static final String NAMESPACE_URI = "http://amqp.apache.org/qpid/management/qman";
     public final static String PREFIX = "qman";
 
-    public static String ADDRESSING_URI = "http://amqp.apache.org/qpid/management/qman/addressing";
-    public static String ADDRESSING_PREFIX = "qman-wsa";
+    public static final String ADDRESSING_URI = "http://amqp.apache.org/qpid/management/qman/addressing";
+    public static final String ADDRESSING_PREFIX = "qman-wsa";
     
     public static final QName RESOURCE_ID_QNAME = new QName(
     		ADDRESSING_URI, 
diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionData.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionData.java
index b796620747..a64659b17c 100644
--- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionData.java
+++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionData.java
@@ -251,16 +251,26 @@ public class BrokerConnectionData
     }
     
     @Override
-    public boolean equals(Object object) {
-    	try 
-    	{
-			BrokerConnectionData connectionData = (BrokerConnectionData) object;
-			return (_host.equals(connectionData._host) )
-					&& (_port == connectionData._port)
-					&& (_virtualHost.equals(connectionData._virtualHost));
-		} catch (Exception exception) {
-			return false;
-		}
+    public boolean equals(Object object)
+    {
+    	if(object instanceof BrokerConnectionData)
+        {
+            try
+            {
+                BrokerConnectionData connectionData = (BrokerConnectionData) object;
+                return (_host.equals(connectionData._host) )
+                        && (_port == connectionData._port)
+                        && (_virtualHost.equals(connectionData._virtualHost));
+            }
+            catch (Exception exception)
+            {
+                return false;
+            }
+        }
+        else
+        {
+            return false;    
+        }
     }
     
     @Override
diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configuration.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configuration.java
index 51dc62f4fa..ab90ec294b 100644
--- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configuration.java
+++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configuration.java
@@ -88,10 +88,6 @@ public final class Configuration
         addTypeMappings();
     }
 
-    void clean()
-    {
-    	INSTANCE = new Configuration();
-    }
     
     /**
      * Returns the singleton instance.
diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/WorkerManagerConfigurationParser.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/WorkerManagerConfigurationParser.java
index b99f272053..4e68b54b12 100644
--- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/WorkerManagerConfigurationParser.java
+++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/configuration/WorkerManagerConfigurationParser.java
@@ -71,6 +71,7 @@ class WorkerManagerConfigurationParser implements IParser
             case MAX_POOL_CAPACITY : 
             {
             	_maxPoolSizeAsString = _currentValue;
+                break;
             }
             case KEEP_ALIVE_TIME: 
             {
diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidPackage.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidPackage.java
index e9799cb147..c25a5d7d1c 100644
--- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidPackage.java
+++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidPackage.java
@@ -71,8 +71,15 @@ final class QpidPackage
         @Override
         public boolean equals (Object obj)
         {
-            QpidClassIdentity identity = (QpidClassIdentity) obj;
-            return name.equals(identity.name) && hash.equals(identity.hash);
+            if(obj instanceof QpidClassIdentity)
+            {
+                QpidClassIdentity identity = (QpidClassIdentity) obj;
+                return name.equals(identity.name) && hash.equals(identity.hash);
+            }
+            else
+            {
+                return false;
+            }
         }
     }
     
diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java
index 343280ca4b..95cb03b04b 100644
--- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java
+++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java
@@ -102,11 +102,18 @@ public final class Binary implements Serializable
     @Override
     public boolean equals (Object obj)
     {
-        try
+        if(obj instanceof Binary)
         {
-            Binary binary = (Binary)obj;
-            return Arrays.equals(_bytes, binary._bytes);
-        } catch (Exception exception)
+            try
+            {
+                Binary binary = (Binary)obj;
+                return Arrays.equals(_bytes, binary._bytes);
+            } catch (Exception exception)
+            {
+                return false;
+            }
+        }
+        else
         {
             return false;
         }
diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java
index c455faaf2c..7f92ec82b0 100644
--- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java
+++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java
@@ -82,13 +82,13 @@ public abstract class Type
     @Override
     public boolean equals (Object obj)
     {
-        return getClass() == obj.getClass();
+        return (obj instanceof Type) && getJavaType() == ((Type)obj).getJavaType();
     }
     
     @Override
     public int hashCode ()
     {
-        return getClass().hashCode();
+        return getJavaType().hashCode();
     }
 
     /**