QPID-6022 : [Java] Fix issues highlighted by code scanning tools

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

21 files changed, 99 insertions, 138 deletions

diff --git a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java
index adeab4ab5d..2b76344085 100644
--- a/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java
+++ b/qpid/java/amqp-1-0-client/src/main/java/org/apache/qpid/amqp_1_0/client/Sender.java
@@ -448,9 +448,9 @@ public class Sender implements DeliveryStateHandler
 
     public void handle(Binary deliveryTag, DeliveryState state, Boolean settled)
     {
+        OutcomeAction action;
         if(state instanceof Outcome)
         {
-            OutcomeAction action;
             if((action = _outcomeActions.remove(deliveryTag)) != null)
             {
 
@@ -464,7 +464,6 @@ public class Sender implements DeliveryStateHandler
         }
         else if(state instanceof TransactionalState)
         {
-            OutcomeAction action;
             if((action = _outcomeActions.remove(deliveryTag)) != null)
             {
                 final Outcome outcome = ((TransactionalState) state).getOutcome();
@@ -472,6 +471,10 @@ public class Sender implements DeliveryStateHandler
             }
 
         }
+        else if(state == null && settled && (action = _outcomeActions.remove(deliveryTag)) != null)
+        {
+            action.onOutcome(deliveryTag, _defaultOutcome);
+        }
     }
 
     public SendingLinkEndpoint getEndpoint()
diff --git a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/ConnectionHandler.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/ConnectionHandler.java
index b5ab25c3fb..96a31cd4e6 100644
--- a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/ConnectionHandler.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/framing/ConnectionHandler.java
@@ -318,22 +318,7 @@ public class ConnectionHandler
                     {
                         _writer.setValue(frame);
 
-                        try
-                        {
                         _writer.writeToBuffer(_buffer);
-                        }
-                        catch(RuntimeException e)
-                        {
-                            e.printStackTrace();
-                            throw e;
-                        }
-                        catch(Error e)
-                        {
-                            e.printStackTrace();
-                            throw e;
-                        }
-
-
                     }
                     else
                     {
diff --git a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java
index 8074354051..b617167528 100644
--- a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/Binary.java
@@ -23,8 +23,6 @@ package org.apache.qpid.amqp_1_0.type;
 import java.nio.ByteBuffer;
 import java.util.Collection;
 
-import static java.lang.Math.min;
-
 public class Binary
 {
 
@@ -64,32 +62,32 @@ public class Binary
 
     public final boolean equals(Object o)
     {
-        Binary buf = (Binary) o;
-        if(o == null)
-        {
-            return false;
-        }
-        final int size = _length;
-        if (size != buf._length)
+        if(o instanceof Binary)
         {
-            return false;
-        }
-
-        final byte[] myData = _data;
-        final byte[] theirData = buf._data;
-        int myOffset = _offset;
-        int theirOffset = buf._offset;
-        final int myLimit = myOffset + size;
+            Binary buf = (Binary) o;
 
-        while(myOffset < myLimit)
-        {
-            if (myData[myOffset++] != theirData[theirOffset++])
+            final int size = _length;
+            if (size == buf._length)
             {
-                return false;
+                final byte[] myData = _data;
+                final byte[] theirData = buf._data;
+                int myOffset = _offset;
+                int theirOffset = buf._offset;
+                final int myLimit = myOffset + size;
+
+                while (myOffset < myLimit)
+                {
+                    if (myData[myOffset++] != theirData[theirOffset++])
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
             }
         }
 
-        return true;
+        return false;
     }
 
 
diff --git a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java
index 9598035899..20b0cd926a 100644
--- a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/type/security/SaslMechanisms.java
@@ -58,7 +58,7 @@ public class SaslMechanisms
             {
                 builder.append(',');
             }
-            builder.append("saslServerMechanisms=").append(_saslServerMechanisms == null ? "" : Arrays.asList(_saslServerMechanisms));
+            builder.append("saslServerMechanisms=").append(Arrays.asList(_saslServerMechanisms));
         }
 
         builder.append('}');
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
index 350e4fcd44..27d914c639 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryImpl.java
@@ -137,15 +137,6 @@ public class ConfiguredObjectFactoryImpl implements ConfiguredObjectFactory
         else
         {
             factory = getConfiguredObjectTypeFactory(category, null);
-            if(factory == null)
-            {
-                ManagedObject annotation = categoryClass.getAnnotation(ManagedObject.class);
-                factory = getConfiguredObjectTypeFactory(category, annotation.defaultType());
-                if(factory == null)
-                {
-                    throw new NoFactoryForTypeException(category, annotation.defaultType());
-                }
-            }
         }
         return factory;
     }
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java
index 2e979b38f1..7294d9c5e8 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/InetNetwork.java
@@ -61,10 +61,10 @@ class InetNetwork
     @Override
     public boolean equals(Object obj)
     {
-        return  (obj != null) &&
-                (obj instanceof InetNetwork) &&
-                ((InetNetwork)obj).network.equals(network) &&
-                ((InetNetwork)obj).netmask.equals(netmask);
+        return (obj != null) &&
+               (obj instanceof InetNetwork) &&
+               ((InetNetwork) obj).network.equals(network) &&
+               ((InetNetwork) obj).netmask.equals(netmask);
     }
 
     public static InetNetwork getFromString(String netspec) throws java.net.UnknownHostException
@@ -95,15 +95,13 @@ class InetNetwork
     {
         try
         {
-            return getByAddress(
-                new byte[]
-                {
-                    (byte) (mask[0] & ip[0]),
-                    (byte) (mask[1] & ip[1]),
-                    (byte) (mask[2] & ip[2]),
-                    (byte) (mask[3] & ip[3])
-                }
-            );
+            return InetAddress.getByAddress(new byte[]
+                                {
+                                        (byte) (mask[0] & ip[0]),
+                                        (byte) (mask[1] & ip[1]),
+                                        (byte) (mask[2] & ip[2]),
+                                        (byte) (mask[3] & ip[3])
+                                });
         }
         catch (Exception _)
         {
@@ -127,7 +125,7 @@ class InetNetwork
      */
     static private String normalizeFromAsterisk(final String netspec)
     {
-        String[] masks = {  "0.0.0.0/0.0.0.0", "0.0.0/255.0.0.0", "0.0/255.255.0.0", "0/255.255.255.0" };
+        String[] masks = {"0.0.0.0/0.0.0.0", "0.0.0/255.0.0.0", "0.0/255.255.0.0", "0/255.255.255.0"};
         char[] srcb = netspec.toCharArray();
         int octets = 0;
         for (int i = 1; i < netspec.length(); i++)
@@ -137,7 +135,7 @@ class InetNetwork
                 octets++;
             }
         }
-        return (octets == 0) ? masks[0] : netspec.substring(0, netspec.length() -1 ).concat(masks[octets]);
+        return (octets == 0) ? masks[0] : netspec.substring(0, netspec.length() - 1).concat(masks[octets]);
     }
 
     /*
@@ -148,30 +146,14 @@ class InetNetwork
      */
     static private String normalizeFromCIDR(final String netspec)
     {
-        final int bits = 32 - Integer.parseInt(netspec.substring(netspec.indexOf('/')+1));
-        final int mask = (bits == 32) ? 0 : 0xFFFFFFFF - ((1 << bits)-1);
+        final int bits = 32 - Integer.parseInt(netspec.substring(netspec.indexOf('/') + 1));
+        final int mask = (bits == 32) ? 0 : 0xFFFFFFFF - ((1 << bits) - 1);
 
         return netspec.substring(0, netspec.indexOf('/') + 1) +
-                Integer.toString(mask >> 24 & 0xFF, 10) + "." +
-                Integer.toString(mask >> 16 & 0xFF, 10) + "." +
-                Integer.toString(mask >>  8 & 0xFF, 10) + "." +
-                Integer.toString(mask >>  0 & 0xFF, 10);
+               Integer.toString(mask >> 24 & 0xFF, 10) + "." +
+               Integer.toString(mask >> 16 & 0xFF, 10) + "." +
+               Integer.toString(mask >> 8 & 0xFF, 10) + "." +
+               Integer.toString(mask >> 0 & 0xFF, 10);
     }
 
-    private static InetAddress getByAddress(byte[] ip) throws java.net.UnknownHostException
-    {
-        InetAddress addr = InetAddress.getByAddress(ip);
-
-        if (addr == null) {
-            addr = InetAddress.getByName
-                   (
-                    Integer.toString(ip[0] & 0xFF, 10) + "." +
-                    Integer.toString(ip[1] & 0xFF, 10) + "." +
-                    Integer.toString(ip[2] & 0xFF, 10) + "." +
-                    Integer.toString(ip[3] & 0xFF, 10)
-                   );
-        }
-
-        return addr;
-    }
-}
\ No newline at end of file
+}
diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
index deaa3ef50b..def75527f3 100644
--- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
@@ -628,7 +628,7 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS
                 queueEntry.release();
                 _unsettledMap.remove(deliveryTag);
             }
-            else if(initialUnsettledMap != null && (initialUnsettledMap.get(deliveryTag) instanceof Outcome))
+            else if(initialUnsettledMap.get(deliveryTag) instanceof Outcome)
             {
                 Outcome outcome = (Outcome) initialUnsettledMap.get(deliveryTag);
 
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 43b0f9da67..d6b8a25b8a 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
@@ -146,7 +146,7 @@ public class Main
             {
                 execute();
             }
-            catch(Throwable e)
+            catch(Exception e)
             {
                 System.err.println("Exception during startup: " + e);
                 e.printStackTrace();
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index 46473900c0..19720ea386 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
@@ -101,7 +101,7 @@ public class AMQSession_0_10 extends AMQSession<BasicMessageConsumer_0_10, Basic
                 {
                     ssn.flushAcknowledgments(true);
                 }
-                catch (Throwable t)
+                catch (Exception t)
                 {
                     _logger.error("error flushing acks", t);
                 }
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java
index c3f36a545a..3d3b753ad3 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java
@@ -20,12 +20,12 @@
  */
 package org.apache.qpid.client.message;
 
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.FieldTable;
+
 public class FieldTableSupport
 {
     private FieldTableSupport()
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
index 681082526c..48bfe74cfc 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
@@ -172,6 +172,10 @@ public class AMQProtocolHandler implements ProtocolEngine
     private long _writtenBytes;
     private long _readBytes;
 
+    private int _messageReceivedCount;
+    private int _messagesOut;
+
+
     private NetworkConnection _network;
     private Sender<ByteBuffer> _sender;
     private long _lastReadTime = System.currentTimeMillis();
@@ -451,9 +455,6 @@ public class AMQProtocolHandler implements ProtocolEngine
         _lastFailoverException = null;
     }
 
-    private static int _messageReceivedCount;
-
-
     public void received(ByteBuffer msg)
     {
         _readBytes += msg.remaining();
@@ -559,8 +560,6 @@ public class AMQProtocolHandler implements ProtocolEngine
 
     }
 
-    private static int _messagesOut;
-
     public StateWaiter createWaiter(Set<AMQState> states) throws AMQException
     {
         return getStateManager().createWaiter(states);
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
index 53b6730ef7..21f1623dd1 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
@@ -20,6 +20,11 @@
  */
 package org.apache.qpid.client.util;
 
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,11 +32,6 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQTimeoutException;
 import org.apache.qpid.client.failover.FailoverException;
 
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
 /**
  * BlockingWaiter is a 'rendezvous' which delegates handling of
  * incoming Objects to a listener implemented as a sub-class of this and hands off the process or
@@ -243,7 +243,7 @@ public abstract class BlockingWaiter<T>
             }
             else
             {
-                _logger.error("WARNING: new error '" + e == null ? "null" : e.getMessage() + "' arrived while old one not yet processed:" + _error.getMessage());
+                _logger.error("WARNING: new error '" + (e == null ? "null" : e.getMessage()) + "' arrived while old one not yet processed:" + _error.getMessage());
             }
 
             if (_waiting.get())
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
index b490aee898..ef0da9b918 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
@@ -136,42 +136,42 @@ public class BasicContentHeaderProperties
         {
             int size = 0;
 
-            if ((_propertyFlags & (CONTENT_TYPE_MASK)) > 0)
+            if ((_propertyFlags & (CONTENT_TYPE_MASK)) != 0)
             {
                 size += EncodingUtils.encodedShortStringLength(_contentType);
             }
 
-            if ((_propertyFlags & ENCODING_MASK) > 0)
+            if ((_propertyFlags & ENCODING_MASK) != 0)
             {
                 size += EncodingUtils.encodedShortStringLength(_encoding);
             }
 
-            if ((_propertyFlags & HEADERS_MASK) > 0)
+            if ((_propertyFlags & HEADERS_MASK) != 0)
             {
                 size += EncodingUtils.encodedFieldTableLength(_headers);
             }
 
-            if ((_propertyFlags & DELIVERY_MODE_MASK) > 0)
+            if ((_propertyFlags & DELIVERY_MODE_MASK) != 0)
             {
                 size += 1;
             }
 
-            if ((_propertyFlags & PRIORITY_MASK) > 0)
+            if ((_propertyFlags & PRIORITY_MASK) != 0)
             {
                 size += 1;
             }
 
-            if ((_propertyFlags & CORRELATION_ID_MASK) > 0)
+            if ((_propertyFlags & CORRELATION_ID_MASK) != 0)
             {
                 size += EncodingUtils.encodedShortStringLength(_correlationId);
             }
 
-            if ((_propertyFlags & REPLY_TO_MASK) > 0)
+            if ((_propertyFlags & REPLY_TO_MASK) != 0)
             {
                 size += EncodingUtils.encodedShortStringLength(_replyTo);
             }
 
-            if ((_propertyFlags & EXPIRATION_MASK) > 0)
+            if ((_propertyFlags & EXPIRATION_MASK) != 0)
             {
                 if (_expiration == 0L)
                 {
@@ -183,32 +183,32 @@ public class BasicContentHeaderProperties
                 }
             }
 
-            if ((_propertyFlags & MESSAGE_ID_MASK) > 0)
+            if ((_propertyFlags & MESSAGE_ID_MASK) != 0)
             {
                 size += EncodingUtils.encodedShortStringLength(_messageId);
             }
 
-            if ((_propertyFlags & TIMESTAMP_MASK) > 0)
+            if ((_propertyFlags & TIMESTAMP_MASK) != 0)
             {
                 size += 8;
             }
 
-            if ((_propertyFlags & TYPE_MASK) > 0)
+            if ((_propertyFlags & TYPE_MASK) != 0)
             {
                 size += EncodingUtils.encodedShortStringLength(_type);
             }
 
-            if ((_propertyFlags & USER_ID_MASK) > 0)
+            if ((_propertyFlags & USER_ID_MASK) != 0)
             {
                 size += EncodingUtils.encodedShortStringLength(_userId);
             }
 
-            if ((_propertyFlags & APPLICATION_ID_MASK) > 0)
+            if ((_propertyFlags & APPLICATION_ID_MASK) != 0)
             {
                 size += EncodingUtils.encodedShortStringLength(_appId);
             }
 
-            if ((_propertyFlags & CLUSTER_ID_MASK) > 0)
+            if ((_propertyFlags & CLUSTER_ID_MASK) != 0)
             {
                 size += EncodingUtils.encodedShortStringLength(_clusterId);
             }
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
index e8499539be..b52b59aa15 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
@@ -210,7 +210,7 @@ final class IoReceiver implements Runnable
                 }
             }
         }
-        catch (Throwable t)
+        catch (Exception t)
         {
             if (shouldReport(t))
             {
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
index a90ea52202..2a70087c10 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLEncryptor.java
@@ -21,13 +21,13 @@
 package org.apache.qpid.transport.network.security.sasl;
 
 
+import javax.security.sasl.Sasl;
+import javax.security.sasl.SaslClient;
+
 import org.apache.qpid.transport.Connection;
 import org.apache.qpid.transport.ConnectionException;
 import org.apache.qpid.transport.ConnectionListener;
 
-import javax.security.sasl.Sasl;
-import javax.security.sasl.SaslClient;
-
 public abstract class SASLEncryptor implements ConnectionListener
 {
     private SaslClient saslClient;
@@ -45,7 +45,7 @@ public abstract class SASLEncryptor implements ConnectionListener
         if (conn.getSaslClient() != null)
         {
             saslClient = conn.getSaslClient();
-            if (saslClient.isComplete() && saslClient.getNegotiatedProperty(Sasl.QOP) == "auth-conf")
+            if (saslClient.isComplete() && "auth-conf".equals(saslClient.getNegotiatedProperty(Sasl.QOP)))
             {                
                 sendBuffSize = Integer.parseInt(
                         (String)saslClient.getNegotiatedProperty(Sasl.RAW_SEND_SIZE));
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java b/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
index 8516e7fa0e..c7fea15576 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
@@ -151,15 +151,15 @@ public class URLHelper
         }
         else
         {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             sb.append('?');
-            for (String key : options.keySet())
+            for (Map.Entry<String,String> entry : options.entrySet())
             {
-                sb.append(key);
+                sb.append(entry.getKey());
 
                 sb.append("='");
 
-                sb.append(options.get(key));
+                sb.append(entry.getValue());
 
                 sb.append("'");
                 sb.append(DEFAULT_OPTION_SEPERATOR);
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java b/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
index b7b9bf8c6e..6dd6a989cb 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
@@ -323,9 +323,9 @@ public final class Strings
         sb.append("<");
         if (map != null)
         {
-            for(String key : map.keySet())
+            for(Map.Entry<String,Object> entry : map.entrySet())
             {
-                sb.append(key).append(" = ").append(map.get(key)).append(" ");
+                sb.append(entry.getKey()).append(" = ").append(entry.getValue()).append(" ");
             }
         }
         sb.append(">");
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java
index 10f62708a4..f34ac941bc 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ParticipantExecutor.java
@@ -25,10 +25,11 @@ import java.util.concurrent.ThreadFactory;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-import org.apache.qpid.disttest.message.ParticipantResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.qpid.disttest.message.ParticipantResult;
+
 public class ParticipantExecutor
 {
     private static final Logger LOGGER = LoggerFactory.getLogger(ParticipantExecutor.class);
@@ -100,7 +101,7 @@ public class ParticipantExecutor
                 }
                 result = _participant.doIt(_client.getClientName());
             }
-            catch (Throwable t)
+            catch (Exception t)
             {
                 String errorMessage = "Unhandled error: " + t.getMessage();
                 LOGGER.error(errorMessage, t);
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java
index e973f07c12..a60a7ec88f 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/TestRunner.java
@@ -26,6 +26,9 @@ import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.disttest.DistributedTestException;
 import org.apache.qpid.disttest.controller.config.QueueConfig;
 import org.apache.qpid.disttest.controller.config.TestInstance;
@@ -36,8 +39,6 @@ import org.apache.qpid.disttest.message.ParticipantResult;
 import org.apache.qpid.disttest.message.Response;
 import org.apache.qpid.disttest.message.StartTestCommand;
 import org.apache.qpid.disttest.message.TearDownTestCommand;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class TestRunner
 {
@@ -72,7 +73,7 @@ public class TestRunner
             {
                 deleteQueues();
             }
-            catch (Throwable t)
+            catch (Exception t)
             {
                 LOGGER.error("Failed to delete test queues during shutdown", t);
             }
diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java
index 782f7ae2fd..330407e375 100644
--- a/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java
+++ b/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/jms/ControllerJmsDelegate.java
@@ -36,13 +36,14 @@ import javax.jms.Session;
 import javax.naming.Context;
 import javax.naming.NamingException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.disttest.DistributedTestException;
 import org.apache.qpid.disttest.controller.CommandListener;
 import org.apache.qpid.disttest.controller.config.QueueConfig;
 import org.apache.qpid.disttest.message.Command;
 import org.apache.qpid.disttest.message.RegisterClientCommand;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class ControllerJmsDelegate
 {
@@ -121,7 +122,7 @@ public class ControllerJmsDelegate
                         processCommandWithFirstSupportingListener(command);
                         LOGGER.debug("Finished processing command for message " + jmsMessageID);
                     }
-                    catch (Throwable t)
+                    catch (Exception t)
                     {
                         LOGGER.error("Can't handle JMS message", t);
                     }
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 845e7e58c3..74d2f1cf97 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
@@ -74,7 +74,7 @@ public class QpidTestCase extends TestCase
             String testExcludes = System.getProperty(TEST_EXCLUDES);
 
             //For the maven build, process the test.excludes property
-            if(testExcludes != null && exclusionListURIs == "")
+            if(testExcludes != null && "".equals(exclusionListURIs))
             {
                 for (String exclude : testExcludes.split("\\s+"))
                 {