From 86ff1e7cd299c602ad282b21e6dfa0a154a56880 Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Tue, 24 Nov 2020 14:12:03 -0800
Subject: [PATCH] another comparison fix
---
java/src/com/zerotier/sdk/VirtualNetworkConfig.java | 4 +++-
java/src/com/zerotier/sdk/VirtualNetworkDNS.java | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
index 867d013b0..c7b48d5c5 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 d967eff80..7046fd424 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);
}