summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGrant Limberg <glimberg@gmail.com>2016-09-05 14:10:07 -0700
committerGrant Limberg <glimberg@gmail.com>2016-09-05 14:10:07 -0700
commit8682c90c7d7dc900bcf0589fd67a98ad773f52f8 (patch)
treec12cf7b43b4d8a9e090ee67fd690cb2ebed50217 /java
parentd063f583eecbcd98837cbbb98a79ac604664625b (diff)
downloadinfinitytier-8682c90c7d7dc900bcf0589fd67a98ad773f52f8.tar.gz
infinitytier-8682c90c7d7dc900bcf0589fd67a98ad773f52f8.zip
ensure routes are also equal when checking for equality on VirtualNetworkConfig objects
Diffstat (limited to 'java')
-rw-r--r--java/src/com/zerotier/sdk/VirtualNetworkConfig.java15
1 files changed, 13 insertions, 2 deletions
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
index 0999525c..64512dad 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
@@ -61,13 +61,24 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
if(assignedAddresses.length == cfg.assignedAddresses.length) {
for(int i = 0; i < assignedAddresses.length; ++i) {
if(!assignedAddresses[i].equals(cfg.assignedAddresses[i])) {
- return false;
+ aaEqual = false;
}
}
} else {
aaEqual = false;
}
+ boolean routesEqual = true;
+ if(routes.length == cfg.routes.length) {
+ for (int i = 0; i < routes.length; ++i) {
+ if (!routes[i].equals(cfg.routes[i])) {
+ routesEqual = false;
+ }
+ }
+ } else {
+ routesEqual = false;
+ }
+
return nwid == cfg.nwid &&
mac == cfg.mac &&
name.equals(cfg.name) &&
@@ -79,7 +90,7 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf
broadcastEnabled == cfg.broadcastEnabled &&
portError == cfg.portError &&
enabled == cfg.enabled &&
- aaEqual;
+ aaEqual && routesEqual;
}
public int compareTo(VirtualNetworkConfig cfg) {