QPID-2886: correct issues highlighted by running FindBugs across the codebase.

Applied patch from Sorin Suciu<ssuciu@gmail.com>


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5.x-dev@1001790 13f79535-47bb-0310-9956-ffa450edef68

34 files changed, 287 insertions, 239 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java b/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
index be52b82789..53118f828a 100644
--- a/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
+++ b/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
@@ -106,9 +106,6 @@ public class QpidCompositeRollingAppender extends FileAppender
     /** Helper class to determine next rollover time */
     RollingCalendar rc = new RollingCalendar();
 
-    /** Current period for roll overs */
-    int checkPeriod = TOP_OF_TROUBLE;
-
     /** The default maximum file size is 10MB. */
     protected long maxFileSize = 10 * 1024 * 1024;
 
@@ -1012,23 +1009,31 @@ public class QpidCompositeRollingAppender extends FileAppender
         {
             // Create the GZIP output stream
             GZIPOutputStream out = new GZIPOutputStream(new FileOutputStream(target));
-
-            // Open the input file
-            FileInputStream in = new FileInputStream(from);
-
-            // Transfer bytes from the input file to the GZIP output stream
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = in.read(buf)) > 0)
+            try
             {
-                out.write(buf, 0, len);
+                // Open the input file
+                FileInputStream in = new FileInputStream(from);
+                try
+                {
+                   // Transfer bytes from the input file to the GZIP output stream
+                   byte[] buf = new byte[1024];
+                   int len;
+                   while ((len = in.read(buf)) > 0)
+                   {
+                       out.write(buf, 0, len);
+                   }
+                }
+                finally
+                {
+                   in.close();
+                }
+                // Complete the GZIP file
+                out.finish();
             }
-
-            in.close();
-
-            // Complete the GZIP file
-            out.finish();
-            out.close();
+            finally
+            {
+                out.close();
+            }    
             // Remove old file.
             from.delete();
         }
diff --git a/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java b/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
index 4afc209ba7..fa3ad3513d 100644
--- a/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
+++ b/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
@@ -166,7 +166,7 @@ public class QpidLog4JConfigurator
 
         private static String constructMessage(final String msg, final SAXParseException ex)
         {
-            return new String(msg + ": Line " + ex.getLineNumber()+" column " +ex.getColumnNumber() + ": " + ex.getMessage());
+            return msg + ": Line " + ex.getLineNumber()+" column " +ex.getColumnNumber() + ": " + ex.getMessage();
         }
     }
     
@@ -252,14 +252,15 @@ public class QpidLog4JConfigurator
             loggersLevels.put("Root", rootLoggerlevelString);
             
 
-            for (String loggerName : loggersLevels.keySet())
+            for (Map.Entry<String, String> entry : loggersLevels.entrySet())
             {
-                String levelString = loggersLevels.get(loggerName);
+                String loggerName = entry.getKey();
+                String levelString = entry.getValue();
                 
                 //let log4j replace any properties in the string
                 String log4jConfiguredString = domConfig.subst(levelString);
                 
-                if(log4jConfiguredString.equals("") & ! log4jConfiguredString.equals(levelString))
+                if(log4jConfiguredString.equals("") && ! log4jConfiguredString.equals(levelString))
                 {
                     //log4j has returned an empty string but this isnt what we gave it.
                     //There may have been an undefined property. Unlike an incorrect
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java b/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
index 40ff590a0a..0b63c68854 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
@@ -178,7 +178,7 @@ public class Configuration
     }
 
 
-    public class InitException extends Exception
+    public static class InitException extends Exception
     {
         InitException(String msg, Throwable cause)
         {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
index 53755ca7ea..d2eea55df2 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
@@ -129,7 +129,7 @@ public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBr
         {
             attributeList.add(attr);
         }
-        
+
         Collections.sort(attributeList);
 
         return attributeList;
@@ -171,7 +171,7 @@ public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBr
                 }
                 catch (Exception e)
                 {
-                    attributeValues.add(new String("-"));
+                    attributeValues.add("-");
                 }
             }
             
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
index 8412c5e065..c79e4d5eb6 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
@@ -555,9 +555,16 @@ public class Main
             }
             else
             {
-                Properties fallbackProps = new Properties();
-                fallbackProps.load(propsFile);
-                PropertyConfigurator.configure(fallbackProps);
+                try 
+                {
+                   Properties fallbackProps = new Properties();
+                   fallbackProps.load(propsFile);
+                   PropertyConfigurator.configure(fallbackProps);
+                }
+                finally
+                {
+                   propsFile.close();
+                }
             }
         }
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
index 5388d12c1d..38a519e0b1 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
@@ -268,7 +268,7 @@ public class ServerConfiguration implements SignalHandler
                 locale = new Locale(parts[0], parts[1]);
                 break;
             default:
-                String variant = parts[2];
+                StringBuilder variant = new StringBuilder(parts[2]);
                 // If we have a variant such as the Java doc suggests for Spanish
                 // Traditional_WIN we may end up with more than 3 parts on a
                 // split with '_'. So we should recombine the variant.
@@ -276,11 +276,11 @@ public class ServerConfiguration implements SignalHandler
                 {
                     for (int index = 3; index < parts.length; index++)
                     {
-                        variant = variant + "_" + parts[index];
+                        variant.append('_').append(parts[index]);
                     }
                 }
 
-                locale = new Locale(parts[0], parts[1], variant);
+                locale = new Locale(parts[0], parts[1], variant.toString());
         }
 
         return locale;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java
index 85e74122c3..0e3a3894fe 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java
@@ -425,6 +425,8 @@ public class HeadersParser
 
         public boolean equals(Object o)
         {
+            assert o != null;
+            assert o instanceof KeyValuePair;
             KeyValuePair other = (KeyValuePair)o;
             return (_key == other._key) && (_value == null ? other._value == null : _value.equals(other._value));
         }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
index a964bce306..a5346bee04 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
@@ -163,13 +163,13 @@ public abstract class ArithmeticExpression<E extends Exception> extends BinaryEx
         {
 
         case INTEGER:
-            return new Integer(left.intValue() + right.intValue());
+            return Integer.valueOf(left.intValue() + right.intValue());
 
         case LONG:
-            return new Long(left.longValue() + right.longValue());
+            return Long.valueOf(left.longValue() + right.longValue());
 
         default:
-            return new Double(left.doubleValue() + right.doubleValue());
+            return Double.valueOf(left.doubleValue() + right.doubleValue());
         }
     }
 
@@ -179,13 +179,13 @@ public abstract class ArithmeticExpression<E extends Exception> extends BinaryEx
         {
 
         case INTEGER:
-            return new Integer(left.intValue() - right.intValue());
+            return Integer.valueOf(left.intValue() - right.intValue());
 
         case LONG:
-            return new Long(left.longValue() - right.longValue());
+            return Long.valueOf(left.longValue() - right.longValue());
 
         default:
-            return new Double(left.doubleValue() - right.doubleValue());
+            return Double.valueOf(left.doubleValue() - right.doubleValue());
         }
     }
 
@@ -195,13 +195,13 @@ public abstract class ArithmeticExpression<E extends Exception> extends BinaryEx
         {
 
         case INTEGER:
-            return new Integer(left.intValue() * right.intValue());
+            return Integer.valueOf(left.intValue() * right.intValue());
 
         case LONG:
-            return new Long(left.longValue() * right.longValue());
+            return Long.valueOf(left.longValue() * right.longValue());
 
         default:
-            return new Double(left.doubleValue() * right.doubleValue());
+            return Double.valueOf(left.doubleValue() * right.doubleValue());
         }
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
index 921005c462..f4a3fd349f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
@@ -47,30 +47,30 @@ public abstract class ComparisonExpression<E extends Exception> extends BinaryEx
         return LogicExpression.createOR(createLessThan(value, left), createGreaterThan(value, right));
     }
 
-    private static final HashSet REGEXP_CONTROL_CHARS = new HashSet();
+    private static final HashSet<Character> REGEXP_CONTROL_CHARS = new HashSet<Character>();
 
     static
     {
-        REGEXP_CONTROL_CHARS.add(new Character('.'));
-        REGEXP_CONTROL_CHARS.add(new Character('\\'));
-        REGEXP_CONTROL_CHARS.add(new Character('['));
-        REGEXP_CONTROL_CHARS.add(new Character(']'));
-        REGEXP_CONTROL_CHARS.add(new Character('^'));
-        REGEXP_CONTROL_CHARS.add(new Character('$'));
-        REGEXP_CONTROL_CHARS.add(new Character('?'));
-        REGEXP_CONTROL_CHARS.add(new Character('*'));
-        REGEXP_CONTROL_CHARS.add(new Character('+'));
-        REGEXP_CONTROL_CHARS.add(new Character('{'));
-        REGEXP_CONTROL_CHARS.add(new Character('}'));
-        REGEXP_CONTROL_CHARS.add(new Character('|'));
-        REGEXP_CONTROL_CHARS.add(new Character('('));
-        REGEXP_CONTROL_CHARS.add(new Character(')'));
-        REGEXP_CONTROL_CHARS.add(new Character(':'));
-        REGEXP_CONTROL_CHARS.add(new Character('&'));
-        REGEXP_CONTROL_CHARS.add(new Character('<'));
-        REGEXP_CONTROL_CHARS.add(new Character('>'));
-        REGEXP_CONTROL_CHARS.add(new Character('='));
-        REGEXP_CONTROL_CHARS.add(new Character('!'));
+        REGEXP_CONTROL_CHARS.add('.');
+        REGEXP_CONTROL_CHARS.add('\\');
+        REGEXP_CONTROL_CHARS.add('[');
+        REGEXP_CONTROL_CHARS.add(']');
+        REGEXP_CONTROL_CHARS.add('^');
+        REGEXP_CONTROL_CHARS.add('$');
+        REGEXP_CONTROL_CHARS.add('?');
+        REGEXP_CONTROL_CHARS.add('*');
+        REGEXP_CONTROL_CHARS.add('+');
+        REGEXP_CONTROL_CHARS.add('{');
+        REGEXP_CONTROL_CHARS.add('}');
+        REGEXP_CONTROL_CHARS.add('|');
+        REGEXP_CONTROL_CHARS.add('(');
+        REGEXP_CONTROL_CHARS.add(')');
+        REGEXP_CONTROL_CHARS.add(':');
+        REGEXP_CONTROL_CHARS.add('&');
+        REGEXP_CONTROL_CHARS.add('<');
+        REGEXP_CONTROL_CHARS.add('>');
+        REGEXP_CONTROL_CHARS.add('=');
+        REGEXP_CONTROL_CHARS.add('!');
     }
 
     static class LikeExpression<E extends Exception> extends UnaryExpression<E> implements BooleanExpression<E>
@@ -111,7 +111,7 @@ public abstract class ComparisonExpression<E extends Exception> extends BinaryEx
                 {
                     regexp.append("."); // match one
                 }
-                else if (REGEXP_CONTROL_CHARS.contains(new Character(c)))
+                else if (REGEXP_CONTROL_CHARS.contains(c))
                 {
                     regexp.append("\\x");
                     regexp.append(Integer.toHexString(0xFFFF & c));
@@ -417,23 +417,23 @@ public abstract class ComparisonExpression<E extends Exception> extends BinaryEx
             {
                 if (rc == Short.class)
                 {
-                    lv = new Short(((Number) lv).shortValue());
+                    lv = ((Number) lv).shortValue();
                 }
                 else if (rc == Integer.class)
                 {
-                    lv = new Integer(((Number) lv).intValue());
+                    lv = ((Number) lv).intValue();
                 }
                 else if (rc == Long.class)
                 {
-                    lv = new Long(((Number) lv).longValue());
+                    lv = ((Number) lv).longValue();
                 }
                 else if (rc == Float.class)
                 {
-                    lv = new Float(((Number) lv).floatValue());
+                    lv = ((Number) lv).floatValue();
                 }
                 else if (rc == Double.class)
                 {
-                    lv = new Double(((Number) lv).doubleValue());
+                    lv = ((Number) lv).doubleValue();
                 }
                 else
                 {
@@ -448,15 +448,15 @@ public abstract class ComparisonExpression<E extends Exception> extends BinaryEx
                 }
                 else if (rc == Long.class)
                 {
-                    lv = new Long(((Number) lv).longValue());
+                    lv = ((Number) lv).longValue();
                 }
                 else if (rc == Float.class)
                 {
-                    lv = new Float(((Number) lv).floatValue());
+                    lv = ((Number) lv).floatValue();
                 }
                 else if (rc == Double.class)
                 {
-                    lv = new Double(((Number) lv).doubleValue());
+                    lv = ((Number) lv).doubleValue();
                 }
                 else
                 {
@@ -467,15 +467,15 @@ public abstract class ComparisonExpression<E extends Exception> extends BinaryEx
             {
                 if (rc == Long.class)
                 {
-                    lv = new Long(((Number) lv).longValue());
+                    lv = ((Number) lv).longValue();
                 }
                 else if (rc == Float.class)
                 {
-                    lv = new Float(((Number) lv).floatValue());
+                    lv = ((Number) lv).floatValue();
                 }
                 else if (rc == Double.class)
                 {
-                    lv = new Double(((Number) lv).doubleValue());
+                    lv = ((Number) lv).doubleValue();
                 }
                 else
                 {
@@ -486,15 +486,15 @@ public abstract class ComparisonExpression<E extends Exception> extends BinaryEx
             {
                 if (rc == Integer.class)
                 {
-                    rv = new Long(((Number) rv).longValue());
+                    rv = ((Number) rv).longValue();
                 }
                 else if (rc == Float.class)
                 {
-                    lv = new Float(((Number) lv).floatValue());
+                    lv = ((Number) lv).floatValue();
                 }
                 else if (rc == Double.class)
                 {
-                    lv = new Double(((Number) lv).doubleValue());
+                    lv = ((Number) lv).doubleValue();
                 }
                 else
                 {
@@ -505,15 +505,15 @@ public abstract class ComparisonExpression<E extends Exception> extends BinaryEx
             {
                 if (rc == Integer.class)
                 {
-                    rv = new Float(((Number) rv).floatValue());
+                    rv = ((Number) rv).floatValue();
                 }
                 else if (rc == Long.class)
                 {
-                    rv = new Float(((Number) rv).floatValue());
+                    rv = ((Number) rv).floatValue();
                 }
                 else if (rc == Double.class)
                 {
-                    lv = new Double(((Number) lv).doubleValue());
+                    lv = ((Number) lv).doubleValue();
                 }
                 else
                 {
@@ -524,15 +524,15 @@ public abstract class ComparisonExpression<E extends Exception> extends BinaryEx
             {
                 if (rc == Integer.class)
                 {
-                    rv = new Double(((Number) rv).doubleValue());
+                    rv = ((Number) rv).doubleValue();
                 }
                 else if (rc == Long.class)
                 {
-                    rv = new Double(((Number) rv).doubleValue());
+                    rv = ((Number) rv).doubleValue();
                 }
                 else if (rc == Float.class)
                 {
-                    rv = new Float(((Number) rv).doubleValue());
+                    rv = ((Number) rv).doubleValue();
                 }
                 else
                 {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
index 799a38af5a..520aabe736 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
@@ -110,19 +110,19 @@ public abstract class UnaryExpression<E extends Exception> implements Expression
         Class clazz = left.getClass();
         if (clazz == Integer.class)
         {
-            return new Integer(-left.intValue());
+            return -left.intValue();
         }
         else if (clazz == Long.class)
         {
-            return new Long(-left.longValue());
+            return -left.longValue();
         }
         else if (clazz == Float.class)
         {
-            return new Float(-left.floatValue());
+            return -left.floatValue();
         }
         else if (clazz == Double.class)
         {
-            return new Double(-left.doubleValue());
+            return -left.doubleValue();
         }
         else if (clazz == BigDecimal.class)
         {
@@ -135,7 +135,7 @@ public abstract class UnaryExpression<E extends Exception> implements Expression
 
             if (BD_LONG_MIN_VALUE.compareTo(bd) == 0)
             {
-                return new Long(Long.MIN_VALUE);
+                return Long.MIN_VALUE;
             }
 
             return bd;
@@ -186,14 +186,7 @@ public abstract class UnaryExpression<E extends Exception> implements Expression
      */
     public boolean equals(Object o)
     {
-
-        if ((o == null) || !this.getClass().equals(o.getClass()))
-        {
-            return false;
-        }
-
-        return toString().equals(o.toString());
-
+        return ((o != null) && this.getClass().equals(o.getClass())) && toString().equals(o.toString());
     }
 
     /**
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
index 36e8f6cf84..258552f2f5 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
@@ -528,9 +528,10 @@ public class LoggingManagementMBean extends AMQManagedObject implements LoggingM
 
             Map<String,String> levels = retrieveConfigFileLoggersLevels(_log4jConfigFileName);
 
-            for (String loggerName : levels.keySet())
+            for (Map.Entry<String,String> entry : levels.entrySet())
             {
-                String level = levels.get(loggerName);
+                String loggerName = entry.getKey();
+                String level = entry.getValue();
 
                 try
                 {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
index 5442259995..bc9bf2486b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
@@ -38,7 +38,7 @@ public class BindingLogSubject extends AbstractLogSubject
      * 3 - Queue Name
      * 4 - Binding RoutingKey
      */
-    protected static String BINDING_FORMAT = "vh(/{0})/ex({1}/{2})/qu({3})/rk({4})";
+    protected static final String BINDING_FORMAT = "vh(/{0})/ex({1}/{2})/qu({3})/rk({4})";
 
     /**
      * Create a BindingLogSubject that Logs in the following format.
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
index 7b9f0e6060..c1f50908ec 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
@@ -36,8 +36,8 @@ public class ChannelLogSubject extends AbstractLogSubject
      * 3 - Virtualhost
      * 4 - Channel ID
      */
-    public static String CHANNEL_FORMAT = ConnectionLogSubject.CONNECTION_FORMAT
-    + "/ch:{4}";
+    public static final String CHANNEL_FORMAT = ConnectionLogSubject.CONNECTION_FORMAT
+                                             + "/ch:{4}";
 
     public ChannelLogSubject(AMQChannel channel)
     {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
index d918502d7f..beeec71230 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
@@ -32,7 +32,7 @@ public class ConnectionLogSubject extends AbstractLogSubject
      * 0 - Connection ID
      * 1 - Remote Address
      */
-    public static String SOCKET_FORMAT = "con:{0}({1})";
+    public static final String SOCKET_FORMAT = "con:{0}({1})";
 
     /**
      * LOG FORMAT for the ConnectionLogSubject,
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
index 0842b7b282..11c5396229 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
@@ -35,7 +35,7 @@ public class ExchangeLogSubject extends AbstractLogSubject
      * 1 - Exchange Type
      * 2 - Exchange Name
      */
-    protected static String EXCHANGE_FORMAT = "vh(/{0})/ex({1}/{2})";
+    protected static final String EXCHANGE_FORMAT = "vh(/{0})/ex({1}/{2})";
 
     /** Create an ExchangeLogSubject that Logs in the following format. */
     public ExchangeLogSubject(Exchange exchange, VirtualHost vhost)
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
index be0d5821e9..bd850b5684 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
@@ -34,7 +34,7 @@ public class MessageStoreLogSubject extends AbstractLogSubject
      * 0 - Virtualhost Name
      * 1 - Message Store Type
      */
-    protected static String MESSAGE_STORE_FORMAT = "vh(/{0})/ms({1})";
+    protected static final String MESSAGE_STORE_FORMAT = "vh(/{0})/ms({1})";
 
     /** Create an ExchangeLogSubject that Logs in the following format. */
     public MessageStoreLogSubject(VirtualHost vhost, MessageStore store)
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
index b66d875bfb..7d71a48fe5 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
@@ -34,7 +34,7 @@ public class SubscriptionLogSubject extends AbstractLogSubject
      *
      * 0 - Subscription ID
      */
-    public static String SUBSCRIPTION_FORMAT = "sub:{0}";
+    public static final String SUBSCRIPTION_FORMAT = "sub:{0}";
 
     /**
      * Create an QueueLogSubject that Logs in the following format.
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
index ec60406eea..3b716cb858 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
@@ -303,7 +303,7 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
      * made using the object reference will not be affected and continue to operate normally.
      */
     
-    private class CustomRMIServerSocketFactory implements RMIServerSocketFactory
+    private static class CustomRMIServerSocketFactory implements RMIServerSocketFactory
     {
 
         public ServerSocket createServerSocket(int port) throws IOException
@@ -311,7 +311,7 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
             return new NoLocalAddressServerSocket(port);
         }
 
-        private class NoLocalAddressServerSocket extends ServerSocket
+        private static class NoLocalAddressServerSocket extends ServerSocket
         {
             NoLocalAddressServerSocket(int port) throws IOException
             {
@@ -327,7 +327,7 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
             }
         }
 
-        private class NoLocalAddressSocket extends Socket
+        private static class NoLocalAddressSocket extends Socket
         {
             @Override
             public InetAddress getInetAddress()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
index 9c2a455897..84eddc9591 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
@@ -372,7 +372,7 @@ class MBeanIntrospector {
         //                                                    cons.getParameterTypes());
 
         return new MBeanConstructorInfo(cons.getName(),
-                                        desc != null ? _defaultConstructorDescription : desc ,
+                                        desc == null ? _defaultConstructorDescription : desc ,
                                         null);
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
index 0ee5763d91..cd699e47c0 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
@@ -266,6 +266,7 @@ public class MBeanInvocationHandlerImpl implements InvocationHandler, Notificati
 
     public void handleNotification(Notification notification, Object handback)
     {
+        assert notification instanceof JMXConnectionNotification;
         // only RMI Connections are serviced here, Local API atta  
         // rmi://169.24.29.116 guest 3
         String[] connectionData = ((JMXConnectionNotification) notification).getConnectionId().split(" ");
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index cc75e2c1ee..2fa75b8668 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -118,7 +118,7 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener
     private final Set<NotificationCheck> _notificationChecks = EnumSet.noneOf(NotificationCheck.class);
 
     private final AtomicLong _stateChangeCount = new AtomicLong(Long.MIN_VALUE);
-    private AtomicReference _asynchronousRunner = new AtomicReference(null);
+    private AtomicReference<Runnable> _asynchronousRunner = new AtomicReference<Runnable>(null);
     private AtomicInteger _deliveredMessages = new AtomicInteger();
     private AtomicBoolean _stopped = new AtomicBoolean(false);
     private LogSubject _logSubject;
@@ -839,23 +839,22 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener
      */
     public List<QueueEntry> getMessagesRangeOnTheQueue(final long fromPosition, final long toPosition)
     {
-        List<QueueEntry> entries = getMessagesOnTheQueue(new QueueEntryFilter()
-        {
-            private long position = 0;
-            
-            public boolean accept(QueueEntry entry)
-            {
-                position++;
-                return (position >= fromPosition) && (position <= toPosition);
-            }
-
-            public boolean filterComplete()
-            {
-                return position >= toPosition;
-            }
-        });
+        return getMessagesOnTheQueue(new QueueEntryFilter()
+                                         {
+                                             private long position = 0;
+                                                   
+                                             public boolean accept(QueueEntry entry)
+                                             {
+                                                 position++;
+                                                 return (position >= fromPosition) && (position <= toPosition);
+                                             }
+
+                                             public boolean filterComplete()
+                                             {
+                                                 return position >= toPosition;
+                                             }
+                                         });
         
-        return entries;
     }
 
     public void moveMessagesToAnotherQueue(final long fromMessageId,
@@ -1508,7 +1507,7 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener
 
             previousStateChangeCount = stateChangeCount;
             deliveryIncomplete = _subscriptionList.size() != 0;
-            boolean done = true;
+            boolean done;
 
             SubscriptionList.SubscriptionNodeIterator subscriptionIter = _subscriptionList.iterator();
             //iterate over the subscribers and try to advance their pointer
@@ -1736,6 +1735,8 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener
 
         public boolean equals(Object o)
         {
+            assert o != null;
+            assert o instanceof QueueEntryListener;
             return _entry == ((QueueEntryListener) o)._entry && _sub == ((QueueEntryListener) o)._sub;
         }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
index 626ab95c2a..3c540849cd 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
@@ -128,7 +128,7 @@ public class SimpleQueueEntryList implements QueueEntryList
     }
 
 
-    public class QueueEntryIteratorImpl implements QueueEntryIterator
+    public static class QueueEntryIteratorImpl implements QueueEntryIterator
     {
 
         private QueueEntryImpl _lastNode;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
index 5a2965cb32..c4f0413613 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/management/AMQUserManagementMBean.java
@@ -193,10 +193,7 @@ public class AMQUserManagementMBean extends AMQManagedObject implements UserMana
         }
         finally
         {
-            if (_accessRightsUpdate.isHeldByCurrentThread())
-            {
-                _accessRightsUpdate.unlock();
-            }
+           _accessRightsUpdate.unlock();
         }
 
         return true;
@@ -257,10 +254,7 @@ public class AMQUserManagementMBean extends AMQManagedObject implements UserMana
                 }
                 finally
                 {
-                    if (_accessRightsUpdate.isHeldByCurrentThread())
-                    {
-                        _accessRightsUpdate.unlock();
-                    }
+                   _accessRightsUpdate.unlock();                  
                 }
             }
         }
@@ -410,16 +404,21 @@ public class AMQUserManagementMBean extends AMQManagedObject implements UserMana
                 _accessRightsUpdate.lock();
 
                 Properties accessRights = new Properties();
-                accessRights.load(new FileInputStream(_accessFile));
+                FileInputStream inStream = new FileInputStream(_accessFile);
+                try 
+                {
+                    accessRights.load(inStream);
+                }
+                finally
+                {
+                    inStream.close();
+                }
                 checkAccessRights(accessRights);
                 setAccessRights(accessRights);
             }
             finally
             {
-                if (_accessRightsUpdate.isHeldByCurrentThread())
-                {
-                    _accessRightsUpdate.unlock();
-                }
+               _accessRightsUpdate.unlock();
             }
         }
         else
@@ -461,8 +460,14 @@ public class AMQUserManagementMBean extends AMQManagedObject implements UserMana
             tmp.deleteOnExit();
 
             FileOutputStream output = new FileOutputStream(tmp);
-            _accessRights.store(output, "Generated by AMQUserManagementMBean Console : Last edited by user:" + getCurrentJMXUser());
-            output.close();
+            try 
+            { 
+               _accessRights.store(output, "Generated by AMQUserManagementMBean Console : Last edited by user:" + getCurrentJMXUser());
+            }
+            finally 
+            {
+               output.close();
+            }
 
             // Swap temp file to main rights file.
             File old = new File(_accessFile.getAbsoluteFile() + ".old");
@@ -495,10 +500,7 @@ public class AMQUserManagementMBean extends AMQManagedObject implements UserMana
         }
         finally
         {
-            if (_accessRightsUpdate.isHeldByCurrentThread())
-            {
-                _accessRightsUpdate.unlock();
-            }
+           _accessRightsUpdate.unlock();
         }
         
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
index 889ce815f4..0857bf4d8f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
@@ -250,10 +250,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
             }
             finally
             {
-                if (_userUpdate.isHeldByCurrentThread())
-                {
-                    _userUpdate.unlock();
-                }
+                _userUpdate.unlock();                
             }
         }
         catch (Exception e)
@@ -300,10 +297,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
         }
         finally
         {
-            if (_userUpdate.isHeldByCurrentThread())
-            {
-                _userUpdate.unlock();
-            }
+            _userUpdate.unlock();
         }
     }
 
@@ -335,10 +329,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
         }
         finally
         {
-            if (_userUpdate.isHeldByCurrentThread())
-            {
-                _userUpdate.unlock();
-            }
+            _userUpdate.unlock();
         }
 
         return true;
@@ -420,10 +411,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
         }
         finally
         {
-            if (_userUpdate.isHeldByCurrentThread())
-            {
-                _userUpdate.unlock();
-            }
+            _userUpdate.unlock();
         }
     }
 
@@ -525,14 +513,19 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
             }
             finally
             {
-                if (reader != null)
+                try
                 {
-                    reader.close();
+                    if (reader != null)
+                    {
+                        reader.close();
+                    }
                 }
-
-                if (writer != null)
+                finally
                 {
-                    writer.close();
+                    if (writer != null)
+                    {
+                        writer.close();
+                    }
                 }
             }
             
@@ -567,10 +560,8 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
         }
         finally
         {
-            if (_userUpdate.isHeldByCurrentThread())
-            {
-                _userUpdate.unlock();
-            }
+            _userUpdate.unlock();
+            
         }
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
index 8665e579ba..17ca947538 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
@@ -202,10 +202,7 @@ public class PlainPasswordFilePrincipalDatabase implements PrincipalDatabase
             }
             finally
             {
-                if (_userUpdate.isHeldByCurrentThread())
-                {
                     _userUpdate.unlock();
-                }
             }
         }
         catch (Exception e)
@@ -243,10 +240,7 @@ public class PlainPasswordFilePrincipalDatabase implements PrincipalDatabase
         }
         finally
         {
-            if (_userUpdate.isHeldByCurrentThread())
-            {
                 _userUpdate.unlock();
-            }
         }
     }
 
@@ -278,10 +272,7 @@ public class PlainPasswordFilePrincipalDatabase implements PrincipalDatabase
         }
         finally
         {
-            if (_userUpdate.isHeldByCurrentThread())
-            {
                 _userUpdate.unlock();
-            }
         }
 
         return true;
@@ -380,10 +371,7 @@ public class PlainPasswordFilePrincipalDatabase implements PrincipalDatabase
         }
         finally
         {
-            if (_userUpdate.isHeldByCurrentThread())
-            {
                 _userUpdate.unlock();
-            }
         }
     }
 
@@ -469,14 +457,19 @@ public class PlainPasswordFilePrincipalDatabase implements PrincipalDatabase
             }
             finally
             {
-                if (reader != null)
+                try
                 {
-                    reader.close();
+                    if (reader != null)
+                    {
+                        reader.close();
+                    }
                 }
-
-                if (writer != null)
+                finally
                 {
-                    writer.close();
+                    if (writer != null)
+                    {
+                        writer.close();
+                    }
                 }
             }
             
@@ -512,10 +505,7 @@ public class PlainPasswordFilePrincipalDatabase implements PrincipalDatabase
         }
         finally
         {
-            if (_userUpdate.isHeldByCurrentThread())
-            {
                 _userUpdate.unlock();
-            }
         }
     }
     
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
index dd0bd096c3..5c13e03886 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
@@ -46,7 +46,7 @@ public abstract class UsernamePasswordInitialiser implements AuthenticationProvi
 
     private ServerCallbackHandler _callbackHandler;
 
-    private class ServerCallbackHandler implements CallbackHandler
+    private static class ServerCallbackHandler implements CallbackHandler
     {
         private final PrincipalDatabase _principalDatabase;
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
index 38e84c799b..8020d97364 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/sasl/crammd5/CRAMMD5HexInitialiser.java
@@ -55,7 +55,7 @@ public class CRAMMD5HexInitialiser extends UsernamePasswordInitialiser
 
     }
 
-    private class HexifyPrincipalDatabase implements PrincipalDatabase
+    private static class HexifyPrincipalDatabase implements PrincipalDatabase
     {
         private PrincipalDatabase _realPricipalDatabase;
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
index d0e64c752f..181b161679 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
@@ -217,14 +217,26 @@ public class DerbyMessageStore extends AbstractMessageStore
         if(!tableExists(DB_VERSION_TABLE_NAME, conn))
         {
             Statement stmt = conn.createStatement();
-
-            stmt.execute(CREATE_DB_VERSION_TABLE);
-            stmt.close();
+            try 
+            {
+               stmt.execute(CREATE_DB_VERSION_TABLE);
+            }
+            finally 
+            {
+               stmt.close();
+            }   
 
             PreparedStatement pstmt = conn.prepareStatement(INSERT_INTO_DB_VERSION);
-            pstmt.setInt(1, DB_VERSION);
-            pstmt.execute();
-            pstmt.close();
+            try 
+            {
+               pstmt.setInt(1, DB_VERSION);
+               pstmt.execute();
+            }
+            finally 
+            {
+                pstmt.close();
+            }
+            
         }
 
     }
@@ -235,9 +247,14 @@ public class DerbyMessageStore extends AbstractMessageStore
         if(!tableExists(EXCHANGE_TABLE_NAME, conn))
         {
             Statement stmt = conn.createStatement();
-
-            stmt.execute(CREATE_EXCHANGE_TABLE);
-            stmt.close();
+            try 
+            {
+               stmt.execute(CREATE_EXCHANGE_TABLE);
+            }
+            finally
+            {
+               stmt.close();
+            }   
         }
     }
 
@@ -246,8 +263,15 @@ public class DerbyMessageStore extends AbstractMessageStore
         if(!tableExists(QUEUE_TABLE_NAME, conn))
         {
             Statement stmt = conn.createStatement();
-            stmt.execute(CREATE_QUEUE_TABLE);
-            stmt.close();
+            try 
+            { 
+               stmt.execute(CREATE_QUEUE_TABLE);
+            }
+            finally
+            {
+               stmt.close();
+            }
+            
         }
     }
 
@@ -256,9 +280,14 @@ public class DerbyMessageStore extends AbstractMessageStore
         if(!tableExists(BINDINGS_TABLE_NAME, conn))
         {
             Statement stmt = conn.createStatement();
-            stmt.execute(CREATE_BINDINGS_TABLE);
-
-            stmt.close();
+            try 
+            {
+              stmt.execute(CREATE_BINDINGS_TABLE);
+            }
+            finally
+            {
+              stmt.close();
+            }
         }
 
     }
@@ -268,9 +297,14 @@ public class DerbyMessageStore extends AbstractMessageStore
         if(!tableExists(QUEUE_ENTRY_TABLE_NAME, conn))
         {
             Statement stmt = conn.createStatement();
-            stmt.execute(CREATE_QUEUE_ENTRY_TABLE);
-
-            stmt.close();
+            try
+            {
+               stmt.execute(CREATE_QUEUE_ENTRY_TABLE);
+            } 
+            finally
+            {
+               stmt.close();
+            }   
         }
 
     }
@@ -280,9 +314,14 @@ public class DerbyMessageStore extends AbstractMessageStore
         if(!tableExists(MESSAGE_META_DATA_TABLE_NAME, conn))
         {
             Statement stmt = conn.createStatement();
-            stmt.execute(CREATE_MESSAGE_META_DATA_TABLE);
-
-            stmt.close();
+            try 
+            {
+               stmt.execute(CREATE_MESSAGE_META_DATA_TABLE);
+            } 
+            finally
+            {
+               stmt.close();
+            }   
         }
 
     }
@@ -293,9 +332,14 @@ public class DerbyMessageStore extends AbstractMessageStore
         if(!tableExists(MESSAGE_CONTENT_TABLE_NAME, conn))
         {
             Statement stmt = conn.createStatement();
-            stmt.execute(CREATE_MESSAGE_CONTENT_TABLE);
-
-            stmt.close();
+            try 
+            {
+               stmt.execute(CREATE_MESSAGE_CONTENT_TABLE);
+            } 
+            finally
+            {
+               stmt.close();
+            }   
         }
 
     }
@@ -305,12 +349,24 @@ public class DerbyMessageStore extends AbstractMessageStore
     private boolean tableExists(final String tableName, final Connection conn) throws SQLException
     {
         PreparedStatement stmt = conn.prepareStatement(TABLE_EXISTANCE_QUERY);
-        stmt.setString(1, tableName);
-        ResultSet rs = stmt.executeQuery();
-        boolean exists = rs.next();
-        rs.close();
-        stmt.close();
-        return exists;
+        try 
+        {
+            stmt.setString(1, tableName);
+            ResultSet rs = stmt.executeQuery();
+            try 
+            {
+                return rs.next();
+            }
+            finally 
+            {
+                rs.close();
+            }
+        }
+        finally 
+        {
+           stmt.close();
+        }   
+        
     }
 
     public void recover() throws AMQException
@@ -425,8 +481,6 @@ public class DerbyMessageStore extends AbstractMessageStore
         try
         {
             conn = newConnection();
-
-
             stmt = conn.createStatement();
             ResultSet rs = stmt.executeQuery(SELECT_FROM_EXCHANGE);
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
index 3fbb6bfa4a..db0f2465aa 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionList.java
@@ -34,7 +34,6 @@ public class SubscriptionList
     private final SubscriptionNode _head = new SubscriptionNode();
 
     private AtomicReference<SubscriptionNode> _tail = new AtomicReference<SubscriptionNode>(_head);
-    private final AMQQueue _queue;
     private AtomicInteger _size = new AtomicInteger();
 
 
@@ -115,7 +114,7 @@ public class SubscriptionList
 
     public SubscriptionList(AMQQueue queue)
     {
-        _queue = queue;
+ 
     }
 
     private void advanceHead()
@@ -176,7 +175,7 @@ public class SubscriptionList
     }
 
 
-    public class SubscriptionNodeIterator
+    public static class SubscriptionNodeIterator
     {
 
         private SubscriptionNode _lastNode;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java
index db02a7bf76..bd96024779 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ThreadPoolFilter.java
@@ -85,7 +85,7 @@ public class ThreadPoolFilter extends IoFilterAdapter
     {
         synchronized (threadIdReuseQueue)
         {
-            threadIdReuseQueue.push(new Integer(id));
+            threadIdReuseQueue.push(id);
         }
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
index faa7b85d58..e404a66ac7 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
@@ -171,7 +171,7 @@ public class MessageStoreTool
     /**
      * Simple ShutdownHook to cleanly shutdown the databases
      */
-    class ShutdownHook implements Runnable
+    static class ShutdownHook implements Runnable
     {
         MessageStoreTool _tool;
 
@@ -443,7 +443,7 @@ public class MessageStoreTool
      *
      *
      */
-    public class State
+    public static class State
     {
         private VirtualHost _vhost = null;
         private AMQQueue _queue = null;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
index 731f6140f9..c46ce0e73d 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
@@ -130,7 +130,7 @@ public class Dump extends Show
                 addShowInformation(hex, ascii, msg, null, false, false, true);
             }
 
-            // Add Content Body seciont
+            // Add Content Body section
             hex.add("Content Body");
             ascii.add("");
             hex.add(Console.ROW_DIVIDER);
@@ -180,12 +180,12 @@ public class Dump extends Show
                             String encStr = new String(encoded, 0, bufsize * 2, DEFAULT_ENCODING);
                             String hexLine = "";
 
-                            int strKength = encStr.length();
-                            for (int c = 0; c < strKength; c++)
+                            int strLength = encStr.length();
+                            for (int c = 0; c < strLength; c++)
                             {
                                 hexLine += encStr.charAt(c);
 
-                                if (c % 2 == 1 && SPACE_BYTES)
+                                if ((c & 1) == 1 && SPACE_BYTES)
                                 {
                                     hexLine += BYTE_SPACER;
                                 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
index ec080a4611..2791a39f92 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
@@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -35,10 +36,10 @@ public class SimpleConsole implements Console
     private static Logger _devlog = LoggerFactory.getLogger(SimpleConsole.class);
 
     /** Console Writer. */
-    protected static BufferedWriter _consoleWriter;
+    protected BufferedWriter _consoleWriter;
 
     /** Console Reader. */
-    protected static BufferedReader _consoleReader;
+    protected BufferedReader _consoleReader;
 
     /** Parser for command-line input. */
     protected CommandParser _parser;
@@ -62,7 +63,7 @@ public class SimpleConsole implements Console
         }
         catch (IOException e)
         {
-            _devlog.error(e.getMessage() + ": Occured whilst trying to write:" + message);
+            _devlog.error(e.getMessage() + ": Occurred whilst trying to write:" + Arrays.asList(message));
         }
 
     }
diff --git a/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java b/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
index 00c27ddf48..bea3d2193f 100644
--- a/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
+++ b/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
@@ -36,7 +36,7 @@ import java.util.ResourceBundle;
 
 public class GenerateLogMessages
 {
-    private static String _tmplDir;
+    private String _tmplDir;
     private String _outputDir;
 
     public static void main(String[] args)
@@ -458,7 +458,7 @@ public class GenerateLogMessages
      * Just a inner exception to be able to identify when a type that is not
      * 'number' occurs in the message parameter text.
      */
-    private class InvalidTypeException extends Throwable
+    private static class InvalidTypeException extends Throwable
     {
         public InvalidTypeException(String message)
         {