From 2ec37d1297dcc2f42a49378567a67f69b490ec3a Mon Sep 17 00:00:00 2001 From: Shreyas Zare Date: Sat, 18 Feb 2023 11:44:57 +0530 Subject: [PATCH] WebServiceZonesApi: minor refactoring changes. --- DnsServerCore/WebServiceZonesApi.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/DnsServerCore/WebServiceZonesApi.cs b/DnsServerCore/WebServiceZonesApi.cs index 1f717c88..22306c33 100644 --- a/DnsServerCore/WebServiceZonesApi.cs +++ b/DnsServerCore/WebServiceZonesApi.cs @@ -398,16 +398,20 @@ namespace DnsServerCore { if ((zoneInfo is not null) && (zoneInfo.Type == AuthZoneType.Primary)) { - foreach (DnssecPrivateKey dnssecPrivateKey in zoneInfo.DnssecPrivateKeys) + IReadOnlyCollection dnssecPrivateKeys = zoneInfo.DnssecPrivateKeys; + if (dnssecPrivateKeys is not null) { - if (dnssecPrivateKey.KeyTag == rdata.ComputedKeyTag) + foreach (DnssecPrivateKey dnssecPrivateKey in dnssecPrivateKeys) { - jsonWriter.WriteString("dnsKeyState", dnssecPrivateKey.State.ToString()); + if (dnssecPrivateKey.KeyTag == rdata.ComputedKeyTag) + { + jsonWriter.WriteString("dnsKeyState", dnssecPrivateKey.State.ToString()); - if ((dnssecPrivateKey.KeyType == DnssecPrivateKeyType.KeySigningKey) && (dnssecPrivateKey.State == DnssecPrivateKeyState.Published)) - jsonWriter.WriteString("dnsKeyStateReadyBy", (zoneInfo.ApexZone as PrimaryZone).GetDnsKeyStateReadyBy(dnssecPrivateKey)); + if ((dnssecPrivateKey.KeyType == DnssecPrivateKeyType.KeySigningKey) && (dnssecPrivateKey.State == DnssecPrivateKeyState.Published)) + jsonWriter.WriteString("dnsKeyStateReadyBy", (zoneInfo.ApexZone as PrimaryZone).GetDnsKeyStateReadyBy(dnssecPrivateKey)); - break; + break; + } } } }