Fix some of the suppressed FindBugs warnings: EI_EXPOSE_REP and EI_EXPOSE_REP2
The fix is to copy the data when setting/returning it.
If this becomes a bottleneck, we can revisit the solution.
Change-Id: I7ad345aa8d19a41221b3550dd9d2cfcd08b36fd1
diff --git a/src/main/java/net/onrc/onos/core/packet/DHCPOption.java b/src/main/java/net/onrc/onos/core/packet/DHCPOption.java
index 81bbed4..d24541e 100644
--- a/src/main/java/net/onrc/onos/core/packet/DHCPOption.java
+++ b/src/main/java/net/onrc/onos/core/packet/DHCPOption.java
@@ -19,8 +19,6 @@
import java.util.Arrays;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
/**
* @author David Erickson (daviderickson@cs.stanford.edu)
*/
@@ -62,19 +60,22 @@
/**
* @return the data
*/
- @SuppressFBWarnings(value = "EI_EXPOSE_REP",
- justification = "TODO: Return a copy of the object?")
public byte[] getData() {
- return data;
+ if (this.data == null) {
+ return null;
+ }
+ return this.data.clone();
}
/**
* @param data the data to set
*/
- @SuppressFBWarnings(value = "EI_EXPOSE_REP2",
- justification = "TODO: Store a copy of the object?")
public DHCPOption setData(byte[] data) {
- this.data = data;
+ if (data == null) {
+ this.data = null;
+ } else {
+ this.data = data.clone();
+ }
return this;
}