ByteArray: do not instantiate arrays if not needed

Move array instantiation into the block where it is used, skipping it
completely in the case we have properly-sized array.

Change-Id: Ie5027f429830a39bfd2835cc5751cb3d6c27dd1e
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 439698fb6b677d9c3e121a0031499b4c68b59c20)

diff --git a/util/src/main/java/org/opendaylight/protocol/util/ByteArray.java b/util/src/main/java/org/opendaylight/protocol/util/ByteArray.java
index 93fbb278aeb117f178eac3fb1834a32dcd0ed57e..10f7f2424130e355ad36e7b4f064a4747390a720 100644 (file)
--- a/util/src/main/java/org/opendaylight/protocol/util/ByteArray.java
+++ b/util/src/main/java/org/opendaylight/protocol/util/ByteArray.java
@@ -118,14 +118,14 @@ public final class ByteArray {
      */
     public static int bytesToInt(final byte[] bytes) {
         Preconditions.checkArgument(bytes.length <= Integer.SIZE / Byte.SIZE, "Cannot convert bytes to integer. Byte array too big.");
-        byte[] res = new byte[Integer.SIZE / Byte.SIZE];
+        final byte[] res;
         if (bytes.length != Integer.SIZE / Byte.SIZE) {
+            res = new byte[Integer.SIZE / Byte.SIZE];
             System.arraycopy(bytes, 0, res, Integer.SIZE / Byte.SIZE - bytes.length, bytes.length);
         } else {
             res = bytes;
         }
-        final ByteBuffer buff = ByteBuffer.wrap(res);
-        return buff.getInt();
+        return ByteBuffer.wrap(res).getInt();
     }
 
     /**
@@ -137,14 +137,14 @@ public final class ByteArray {
      */
     public static long bytesToLong(final byte[] bytes) {
         Preconditions.checkArgument(bytes.length <= Long.SIZE / Byte.SIZE, "Cannot convert bytes to long.Byte array too big.");
-        byte[] res = new byte[Long.SIZE / Byte.SIZE];
+        final byte[] res;
         if (bytes.length != Long.SIZE / Byte.SIZE) {
+            res = new byte[Long.SIZE / Byte.SIZE];
             System.arraycopy(bytes, 0, res, Long.SIZE / Byte.SIZE - bytes.length, bytes.length);
         } else {
             res = bytes;
         }
-        final ByteBuffer buff = ByteBuffer.wrap(res);
-        return buff.getLong();
+        return ByteBuffer.wrap(res).getLong();
     }
 
     /**