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
---
 .../src/main/java/org/apache/qpid/console/Broker.java      |  3 +--
 .../src/main/java/org/apache/qpid/console/ClassKey.java    |  4 ++--
 .../src/main/java/org/apache/qpid/console/SchemaClass.java |  4 ++--
 .../src/main/java/org/apache/qpid/console/Session.java     | 14 +++++++-------
 4 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'java/management/console')

diff --git a/java/management/console/src/main/java/org/apache/qpid/console/Broker.java b/java/management/console/src/main/java/org/apache/qpid/console/Broker.java
index 2ea2ab8a70..16c77449f1 100644
--- a/java/management/console/src/main/java/org/apache/qpid/console/Broker.java
+++ b/java/management/console/src/main/java/org/apache/qpid/console/Broker.java
@@ -56,7 +56,7 @@ public class Broker implements MessageListener
     }
 
     private static Logger log = LoggerFactory.getLogger(Broker.class);
-    public static int SYNC_TIME = 60000;
+    public static final int SYNC_TIME = 60000;
     // JMS Stuff
     private javax.jms.Session session;
     boolean sessionTransacted = false;
@@ -132,7 +132,6 @@ public class Broker implements MessageListener
         try
         {
             byte[] buf = new byte[1024];
-            byte[] body = new byte[1024];
             BBEncoder bbenc = (BBEncoder) enc;
             BytesMessage msg = session.createBytesMessage();
             ByteBuffer slice = bbenc.buffer();
diff --git a/java/management/console/src/main/java/org/apache/qpid/console/ClassKey.java b/java/management/console/src/main/java/org/apache/qpid/console/ClassKey.java
index 9eac8942cb..1fbf4c7f3d 100644
--- a/java/management/console/src/main/java/org/apache/qpid/console/ClassKey.java
+++ b/java/management/console/src/main/java/org/apache/qpid/console/ClassKey.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
 
 public class ClassKey
 {
-    private static Logger log = LoggerFactory.getLogger(ClassKey.class);
+    private static final Logger log = LoggerFactory.getLogger(ClassKey.class);
     private String packageName;
     private String className;
     private long[] hash = new long[4];
@@ -79,7 +79,7 @@ public class ClassKey
     @Override
     public boolean equals(Object obj)
     {
-        if (obj.getClass().equals(this.getClass()))
+        if(obj instanceof ClassKey && obj.getClass().equals(this.getClass()))
         {
             ClassKey other = (ClassKey) obj;
             return (other.getKeyString().equals(this.getKeyString()));
diff --git a/java/management/console/src/main/java/org/apache/qpid/console/SchemaClass.java b/java/management/console/src/main/java/org/apache/qpid/console/SchemaClass.java
index a0faa6c73d..311d81cc8e 100644
--- a/java/management/console/src/main/java/org/apache/qpid/console/SchemaClass.java
+++ b/java/management/console/src/main/java/org/apache/qpid/console/SchemaClass.java
@@ -26,8 +26,8 @@ import org.apache.qpid.transport.codec.*;
 
 public class SchemaClass
 {
-    public static int CLASS_KIND_EVENT = 2;
-    public static int CLASS_KIND_TABLE = 1;
+    public static final int CLASS_KIND_EVENT = 2;
+    public static final int CLASS_KIND_TABLE = 1;
     public ArrayList<SchemaArgument> arguments = new ArrayList<SchemaArgument>();
     private ClassKey classKey;
     private int kind;
diff --git a/java/management/console/src/main/java/org/apache/qpid/console/Session.java b/java/management/console/src/main/java/org/apache/qpid/console/Session.java
index 3bbc8ecdad..a590a95546 100644
--- a/java/management/console/src/main/java/org/apache/qpid/console/Session.java
+++ b/java/management/console/src/main/java/org/apache/qpid/console/Session.java
@@ -39,10 +39,10 @@ import org.slf4j.LoggerFactory;
 public class Session
 {
     private static Logger log = LoggerFactory.getLogger(Session.class);
-    public static int CONTEXT_SYNC = 1;
-    public static int CONTEXT_STARTUP = 2;
-    public static int CONTEXT_MULTIGET = 3;
-    public static int DEFAULT_GET_WAIT_TIME = 60000;
+    public static final int CONTEXT_SYNC = 1;
+    public static final int CONTEXT_STARTUP = 2;
+    public static final int CONTEXT_MULTIGET = 3;
+    public static final int DEFAULT_GET_WAIT_TIME = 60000;
     public boolean recieveObjects = true;
     public boolean recieveEvents = true;
     public boolean recieveHeartbeat = true;
@@ -79,12 +79,12 @@ public class Session
     {
         ArrayList<String> bindings = new ArrayList<String>();
         bindings.add("schema.#");
-        if (recieveObjects & recieveEvents & recieveHeartbeat & !userBindings)
+        if (recieveObjects && recieveEvents && recieveHeartbeat && !userBindings)
         {
             bindings.add("console.#");
         } else
         {
-            if (recieveObjects & !userBindings)
+            if (recieveObjects && !userBindings)
             {
                 bindings.add("console.obj.#");
             } else
@@ -675,7 +675,7 @@ public class Session
             broker.decrementOutstanding();
         } else
         {
-            if ((context.equals(CONTEXT_SYNC)) & broker.getSyncInFlight())
+            if ((context.equals(CONTEXT_SYNC)) && broker.getSyncInFlight())
             {
                 broker.setSyncInFlight(false);
             } else
-- 
cgit v1.2.1