diff options
| author | Grant Limberg <[email protected]> | 2020-11-24 14:12:03 -0800 |
|---|---|---|
| committer | Grant Limberg <[email protected]> | 2020-11-24 14:12:30 -0800 |
| commit | 86ff1e7cd299c602ad282b21e6dfa0a154a56880 (patch) | |
| tree | bc0b7166e66c687949185728259058c072d4dd71 /java/src/com | |
| parent | 13d7e2f2b980cc5f311208b24998d660bac621d1 (diff) | |
another comparison fix
Diffstat (limited to 'java/src/com')
| -rw-r--r-- | java/src/com/zerotier/sdk/VirtualNetworkConfig.java | 4 | ||||
| -rw-r--r-- | java/src/com/zerotier/sdk/VirtualNetworkDNS.java | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java index 867d013b..c7b48d5c 100644 --- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java +++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java @@ -152,7 +152,9 @@ public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConf } boolean dnsEquals = false; - if (this.dns != null && cfg.dns != null) { + if (this.dns == null || cfg.dns == null) { + dnsEquals = true; + } else if (this.dns != null) { dnsEquals = this.dns.equals(cfg.dns); } diff --git a/java/src/com/zerotier/sdk/VirtualNetworkDNS.java b/java/src/com/zerotier/sdk/VirtualNetworkDNS.java index d967eff8..7046fd42 100644 --- a/java/src/com/zerotier/sdk/VirtualNetworkDNS.java +++ b/java/src/com/zerotier/sdk/VirtualNetworkDNS.java @@ -15,6 +15,7 @@ public class VirtualNetworkDNS implements Comparable<VirtualNetworkDNS> { public VirtualNetworkDNS() {} public boolean equals(VirtualNetworkDNS o) { + if (o == null) return false; return domain.equals(o.domain) && servers.equals(o.servers); } |
