From f0da43dbdd1cfbc9b478fa44b4b99c087f1aafe4 Mon Sep 17 00:00:00 2001 From: kdarapu Date: Wed, 4 Jan 2017 16:31:45 +0530 Subject: [PATCH] Addressed change request and rectified for hashcode also # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch review/kishore_darapu/onos698 # Changes to be committed: # modified: protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa10.java # modified: protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa11.java # modified: protocols/ospf/protocol/src/main/java/org/onosproject/ospf/protocol/lsa/types/OpaqueLsa9.java # Change-Id: I41021f62dc8c662f3c61c8ae1358f32e409143e3 --- .../org/onosproject/ospf/protocol/lsa/types/OpaqueLsa10.java | 2 +- .../org/onosproject/ospf/protocol/lsa/types/OpaqueLsa11.java | 3 +-- .../org/onosproject/ospf/protocol/lsa/types/OpaqueLsa9.java | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) 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 ee358b9f6a..76d3da5383 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 @@ -198,6 +198,6 @@ public class OpaqueLsa10 extends OpaqueLsaHeader { @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 9c1f7bb15f..30885a58aa 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,7 +16,6 @@ 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 java.util.Arrays; @@ -114,7 +113,7 @@ public class OpaqueLsa11 extends OpaqueLsaHeader { @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 4c1823731d..e64effe769 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,7 +16,6 @@ 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 java.util.Arrays; @@ -116,7 +115,7 @@ public class OpaqueLsa9 extends OpaqueLsaHeader { @Override public int hashCode() { - return Objects.hashCode(opaqueInfo); + return Arrays.hashCode(opaqueInfo); } @Override