From 6196c64ce2cbc7757b64fc5d773bc54882d512bd Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Tue, 20 Dec 2022 14:28:01 +0100 Subject: [PATCH] fix zones list --- .../de/hsadmin/pillar/JsonPillarServlet.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java b/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java index fd0f559..519a3fb 100644 --- a/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java +++ b/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java @@ -144,20 +144,6 @@ public class JsonPillarServlet extends HttpServlet { writer.println(" }"); } writer.println(" ]"); - boolean firstLoopZones = true; - writer.println(" , \"zones\": ["); - for (final String zone : dnsZones.keySet()) { - if (firstLoopZones) { - firstLoopZones = false; - writer.println(" {"); - } else { - writer.println(" , {"); - } - writer.println(" \"zone\": \"" + zone + "\""); - writer.println(" , \"acmeupdates\": " + dnsZones.get(zone).toString().toLowerCase()); - writer.println(" }"); - } - writer.println(" ]"); writer.println(" , \"pacs\": ["); final Iterator pacsIterator = pacsResult.iterator(); boolean firstLoopPacs = true; @@ -244,6 +230,20 @@ public class JsonPillarServlet extends HttpServlet { writer.println(" }"); } writer.println(" ]"); + boolean firstLoopZones = true; + writer.println(" , \"zones\": ["); + for (final String zone : dnsZones.keySet()) { + if (firstLoopZones) { + firstLoopZones = false; + writer.println(" {"); + } else { + writer.println(" , {"); + } + writer.println(" \"zone\": \"" + zone + "\""); + writer.println(" , \"acmeupdates\": " + dnsZones.get(zone).toString().toLowerCase()); + writer.println(" }"); + } + writer.println(" ]"); writer.println("}"); writer.close(); transaction.close();