commit 1d595c0ff5a499111df12662ad1b4a2d232d08cd
author Pavlin Radoslavov <pavlin@onlab.us> Wed Apr 16 14:11:54 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Thu Apr 17 09:55:17 2014 -0700
tree ac2cb94638ee44eed407421e138b4f081f0190b7
parent 1f6c7a24bd3a4d43cb338acdf9cacd39c9a6cd8b

Use ArrayUtils.clone() to clone byte[] arrays.

Using ArrayUtils.clone() simplifies the code, because it handles
null arrays.

Change-Id: I434856c5a9713759a642dd32a7ca8dfafb136047

src/main/java/net/onrc/onos/core/packet/DHCP.java

diff --git a/src/main/java/net/onrc/onos/core/packet/DHCP.java b/src/main/java/net/onrc/onos/core/packet/DHCP.java
index 22d6c7a..82ba850 100644
--- a/src/main/java/net/onrc/onos/core/packet/DHCP.java
+++ b/src/main/java/net/onrc/onos/core/packet/DHCP.java
@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.ListIterator;
 
+import org.apache.commons.lang.ArrayUtils;
+
 /**
  * @author David Erickson (daviderickson@cs.stanford.edu)
  */
@@ -268,21 +270,14 @@
      * @return the clientHardwareAddress
      */
     public byte[] getClientHardwareAddress() {
-        if (this.clientHardwareAddress == null) {
-            return null;
-        }
-        return this.clientHardwareAddress.clone();
+        return ArrayUtils.clone(this.clientHardwareAddress);
     }
 
     /**
      * @param clientHardwareAddress the clientHardwareAddress to set
      */
     public DHCP setClientHardwareAddress(byte[] clientHardwareAddress) {
-        if (clientHardwareAddress == null) {
-            this.clientHardwareAddress = null;
-        } else {
-            this.clientHardwareAddress = clientHardwareAddress.clone();
-        }
+        this.clientHardwareAddress = ArrayUtils.clone(clientHardwareAddress);
         return this;
     }