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/IPv4.java

diff --git a/src/main/java/net/onrc/onos/core/packet/IPv4.java b/src/main/java/net/onrc/onos/core/packet/IPv4.java
index fbb91ab..f105428 100644
--- a/src/main/java/net/onrc/onos/core/packet/IPv4.java
+++ b/src/main/java/net/onrc/onos/core/packet/IPv4.java
@@ -26,6 +26,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.lang.ArrayUtils;
+
 /**
  * @author David Erickson (daviderickson@cs.stanford.edu)
  */
@@ -266,10 +268,7 @@
      * @return the options
      */
     public byte[] getOptions() {
-        if (this.options == null) {
-            return null;
-        }
-        return this.options.clone();
+        return ArrayUtils.clone(this.options);
     }
 
     /**
@@ -280,11 +279,7 @@
             throw new IllegalArgumentException(
                     "Options length must be a multiple of 4");
         }
-        if (options == null) {
-            this.options = null;
-        } else {
-            this.options = options.clone();
-        }
+        this.options = ArrayUtils.clone(options);
         return this;
     }