ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-14 13:18:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix equals() methods

Browse Source
This commit is contained in:
Grant Limberg
2020-05-14 15:08:37 -07:00
parent f12c75e68b
commit f8ba1962e6
2 changed files with 48 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/src/com/zerotier/sdk/VirtualNetworkRoute.java
View File

@ -58,14 +58,23 @@ public final class VirtualNetworkRoute implements Comparable<VirtualNetworkRoute
*/
public int metric;
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(target.toString());
if (via != null) {
sb.append(via.toString());
}
return sb.toString();
}
@Override
public int compareTo(VirtualNetworkRoute other) {
return target.toString().compareTo(other.target.toString());
return this.toString().compareTo(other.toString());
}
public boolean equals(VirtualNetworkRoute other) {
boolean targetEquals;
boolean targetEquals = false;
if (target == null && other.target == null) {
targetEquals = true;
}
@ -76,7 +85,7 @@ public final class VirtualNetworkRoute implements Comparable<VirtualNetworkRoute
targetEquals = false;
}
else {
targetEquals = target.equals(other.target);
targetEquals = target.toString().equals(other.target.toString());
}
@ -91,12 +100,10 @@ public final class VirtualNetworkRoute implements Comparable<VirtualNetworkRoute
viaEquals = false;
}
else {
viaEquals = via.equals(other.via);
viaEquals = via.toString().equals(other.via.toString());
}
return viaEquals &&
viaEquals &&
flags == other.flags &&
metric == other.metric;
viaEquals;
}
}