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

2 files changed, 21 insertions, 39 deletions

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);