Use ArrayUtils.clone() to clone byte[] arrays.
Using ArrayUtils.clone() simplifies the code, because it handles
null arrays.
Change-Id: I434856c5a9713759a642dd32a7ca8dfafb136047
diff --git a/src/main/java/net/onrc/onos/core/packet/Data.java b/src/main/java/net/onrc/onos/core/packet/Data.java
index e79cf7b..f63306b 100644
--- a/src/main/java/net/onrc/onos/core/packet/Data.java
+++ b/src/main/java/net/onrc/onos/core/packet/Data.java
@@ -19,6 +19,8 @@
import java.util.Arrays;
+import org.apache.commons.lang.ArrayUtils;
+
/**
* @author David Erickson (daviderickson@cs.stanford.edu)
*/
@@ -35,40 +37,26 @@
* @param data
*/
public Data(byte[] data) {
- if (data == null) {
- this.data = null;
- } else {
- this.data = data.clone();
- }
+ this.data = ArrayUtils.clone(data);
}
/**
* @return the data
*/
public byte[] getData() {
- if (this.data == null) {
- return null;
- }
- return this.data.clone();
+ return ArrayUtils.clone(this.data);
}
/**
* @param data the data to set
*/
public Data setData(byte[] data) {
- if (data == null) {
- this.data = null;
- } else {
- this.data = data.clone();
- }
+ this.data = ArrayUtils.clone(data);
return this;
}
public byte[] serialize() {
- if (this.data == null) {
- return null;
- }
- return this.data.clone();
+ return ArrayUtils.clone(this.data);
}
@Override