diff --git a/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa10.java b/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa10.java index df9c8f5348..7cdce93d62 100644 --- a/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa10.java +++ b/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa10.java @@ -29,6 +29,7 @@ import org.onosproject.ospf.protocol.lsa.tlvtypes.OpaqueTopLevelTlvTypes; import org.onosproject.ospf.protocol.lsa.tlvtypes.RouterTlv; import org.onosproject.ospf.protocol.util.OspfParameters; +import java.util.Arrays; import java.util.ArrayList; import java.util.List; @@ -192,11 +193,11 @@ public class OpaqueLsa10 extends OpaqueLsaHeader { } OpaqueLsa10 that = (OpaqueLsa10) o; return Objects.equal(topLevelValues, that.topLevelValues) && - Objects.equal(opaqueInfo, that.opaqueInfo); + Arrays.equals(opaqueInfo, that.opaqueInfo); } @Override public int hashCode() { - return Objects.hashCode(opaqueInfo, topLevelValues); + return Objects.hashCode(Arrays.hashCode(opaqueInfo), topLevelValues); } } \ No newline at end of file diff --git a/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa11.java b/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa11.java index 3f5d56a444..fb982fac12 100644 --- a/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa11.java +++ b/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa11.java @@ -16,12 +16,13 @@ package org.onosproject.ospf.protocol.lsa.types; import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; import com.google.common.primitives.Bytes; import org.jboss.netty.buffer.ChannelBuffer; import org.onosproject.ospf.controller.OspfLsaType; import org.onosproject.ospf.protocol.lsa.OpaqueLsaHeader; +import java.util.Arrays; + /** * Representation of an Opaque LSA of type AS (11). */ @@ -106,12 +107,12 @@ public class OpaqueLsa11 extends OpaqueLsaHeader { return false; } OpaqueLsa11 that = (OpaqueLsa11) o; - return Objects.equal(opaqueInfo, that.opaqueInfo); + return Arrays.equals(opaqueInfo, that.opaqueInfo); } @Override public int hashCode() { - return Objects.hashCode(opaqueInfo); + return Arrays.hashCode(opaqueInfo); } @Override diff --git a/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa9.java b/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa9.java index 5b6068441e..1bff5e01c3 100644 --- a/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa9.java +++ b/protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa9.java @@ -16,12 +16,13 @@ package org.onosproject.ospf.protocol.lsa.types; import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; import com.google.common.primitives.Bytes; import org.jboss.netty.buffer.ChannelBuffer; import org.onosproject.ospf.controller.OspfLsaType; import org.onosproject.ospf.protocol.lsa.OpaqueLsaHeader; +import java.util.Arrays; + /** * Representation of an Opaque LSA of type link local (9). */ @@ -108,12 +109,12 @@ public class OpaqueLsa9 extends OpaqueLsaHeader { return false; } OpaqueLsa9 that = (OpaqueLsa9) o; - return Objects.equal(opaqueInfo, that.opaqueInfo); + return Arrays.equals(opaqueInfo, that.opaqueInfo); } @Override public int hashCode() { - return Objects.hashCode(opaqueInfo); + return Arrays.hashCode(opaqueInfo); } @Override