X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsal%2Fapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fpacket%2FARP.java;h=8fc0d625ebe0dd5b08bff4df864efe6a2e3068bd;hb=18fa9cb41678400d1decd007a66fc1f7be894f66;hp=f3aa35f637bdc2e0346beffe8899d0b56b6bb24c;hpb=42210c03b0a4c54706320ba9f55794c0abd4d201;p=controller.git diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/ARP.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/ARP.java index f3aa35f637..8fc0d625eb 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/ARP.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/ARP.java @@ -13,8 +13,6 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; @@ -39,6 +37,8 @@ public class ARP extends Packet { public static short REQUEST = (short) 0x1; public static short REPLY = (short) 0x2; + public static short PROTO_TYPE_IP = 0x800; + private static Map> fieldCoordinates = new LinkedHashMap>() { private static final long serialVersionUID = 1L; { @@ -249,11 +249,27 @@ public class ARP extends Packet { @Override public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); + final int prime = 31; + int result = super.hashCode(); + result = prime * result + + ((fieldValues == null) ? 0 : fieldValues.hashCode()); + return result; } @Override public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); + if (this == obj) + return true; + if (!super.equals(obj)) + return false; + if (getClass() != obj.getClass()) + return false; + ARP other = (ARP) obj; + if (fieldValues == null) { + if (other.fieldValues != null) + return false; + } else if (!fieldValues.equals(other.fieldValues)) + return false; + return true; } }