Sonar suggestion - possible null pointer dereferences in equals() methods
Change-Id: I021c202df99098e5ecf05949954c4c9355d944db
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2Tunnel.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2Tunnel.java
index 8855a21..aa7d99c 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2Tunnel.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2Tunnel.java
@@ -155,7 +155,7 @@
@Override
public int hashCode() {
- return Objects.hash(this.tunnelId, this.pwLabel);
+ return Objects.hash(this.tunnelId, this.pwMode, this.sdTag, this.pwLabel, this.interCoLabel);
}
@Override
@@ -164,10 +164,6 @@
return true;
}
- if (getClass() != o.getClass()) {
- return false;
- }
-
if (o instanceof DefaultL2Tunnel) {
DefaultL2Tunnel that = (DefaultL2Tunnel) o;
return this.tunnelId == that.tunnelId &&
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelDescription.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelDescription.java
index 8c72890..a91f5ee 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelDescription.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelDescription.java
@@ -90,10 +90,6 @@
return true;
}
- if (getClass() != o.getClass()) {
- return false;
- }
-
if (o instanceof DefaultL2TunnelDescription) {
DefaultL2TunnelDescription that = (DefaultL2TunnelDescription) o;
// Equality is based on tunnel id and pw label