X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fsal%2Fapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcore%2FMacAddress.java;h=b4d1045bac2e461c4c408b6ae04e5531f07e4b53;hp=2bfeb46248416b58327a503a97fa5212c22076ac;hb=04839638880d0ce748a588250256440154e2d8f4;hpb=b571c5f3e6e9b2dcf2cff2314537c7b1c61533b4 diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java index 2bfeb46248..b4d1045bac 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java @@ -9,13 +9,13 @@ package org.opendaylight.controller.sal.core; +import java.util.Arrays; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; /** @@ -79,12 +79,27 @@ public class MacAddress extends Property { @Override public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); + final int prime = 31; + int result = super.hashCode(); + result = prime * result + Arrays.hashCode(controllerMacAddress); + result = prime * result + Arrays.hashCode(nodeMacAddress); + 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; + MacAddress other = (MacAddress) obj; + if (!Arrays.equals(controllerMacAddress, other.controllerMacAddress)) + return false; + if (!Arrays.equals(nodeMacAddress, other.nodeMacAddress)) + return false; + return true; } @Override