diff options
Diffstat (limited to 'framework/src/onos/protocols/pcep')
3 files changed, 6 insertions, 26 deletions
diff --git a/framework/src/onos/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/ISISAreaIdentifierTlv.java b/framework/src/onos/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/ISISAreaIdentifierTlv.java index 648dbb66..f9fb4f89 100644 --- a/framework/src/onos/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/ISISAreaIdentifierTlv.java +++ b/framework/src/onos/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/ISISAreaIdentifierTlv.java @@ -15,6 +15,7 @@ */ package org.onosproject.pcepio.types; +import java.util.Arrays; import java.util.Objects; import org.jboss.netty.buffer.ChannelBuffer; @@ -100,7 +101,7 @@ public class ISISAreaIdentifierTlv implements PcepValueType { @Override public int hashCode() { - return Objects.hash(rawValue); + return Objects.hash(Arrays.hashCode(rawValue), rawValue.length); } @Override @@ -110,7 +111,7 @@ public class ISISAreaIdentifierTlv implements PcepValueType { } if (obj instanceof ISISAreaIdentifierTlv) { ISISAreaIdentifierTlv other = (ISISAreaIdentifierTlv) obj; - return Objects.equals(hLength, other.hLength) && Objects.equals(rawValue, other.rawValue); + return Objects.equals(hLength, other.hLength) && Arrays.equals(rawValue, other.rawValue); } return false; } diff --git a/framework/src/onos/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkNameTlv.java b/framework/src/onos/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkNameTlv.java index aa0f11a7..34dea5ba 100644 --- a/framework/src/onos/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkNameTlv.java +++ b/framework/src/onos/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LinkNameTlv.java @@ -15,8 +15,7 @@ */ package org.onosproject.pcepio.types; -import java.util.Objects; - +import java.util.Arrays; import org.jboss.netty.buffer.ChannelBuffer; import org.onosproject.pcepio.protocol.PcepVersion; import org.slf4j.Logger; @@ -100,7 +99,7 @@ public class LinkNameTlv implements PcepValueType { @Override public int hashCode() { - return Objects.hash(rawValue); + return Arrays.hashCode(rawValue); } @Override @@ -110,7 +109,7 @@ public class LinkNameTlv implements PcepValueType { } if (obj instanceof LinkNameTlv) { LinkNameTlv other = (LinkNameTlv) obj; - return Objects.equals(rawValue, other.rawValue); + return Arrays.equals(this.rawValue, other.rawValue); } return false; } diff --git a/framework/src/onos/protocols/pcep/pom.xml b/framework/src/onos/protocols/pcep/pom.xml index c8e4222d..466b0c3c 100755 --- a/framework/src/onos/protocols/pcep/pom.xml +++ b/framework/src/onos/protocols/pcep/pom.xml @@ -37,24 +37,4 @@ <module>pcepio</module> </modules> - <dependencies> - <dependency> - <groupId>org.onosproject</groupId> - <artifactId>onlab-misc</artifactId> - </dependency> - <dependency> - <groupId>org.onosproject</groupId> - <artifactId>onlab-junit</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - </plugins> - </build> - </project> |