summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eriksen <andreer@verizonmedia.com>2020-02-11 11:58:41 +0100
committerGitHub <noreply@github.com>2020-02-11 11:58:41 +0100
commit4a8eb0cf786aa2d8df3d104d42b68e8d3ee9e672 (patch)
tree7b553324476e299fa0b3b2f780a78a7e1c8f683c
parentfaa3a4a5d4d512be13fc2de2d4c1e5a7cdf5ad35 (diff)
parent7b407ac3495bba103c15aad3110011bc41daa0f4 (diff)
Merge pull request #12148 from vespa-engine/andreer/backfill-bugfix-1
iterate over children, not path elements
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
index b15daa19d6c..ad2835e301f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
@@ -527,9 +527,9 @@ public class CuratorDb {
public Map<ApplicationId, EndpointCertificateMetadata> readAllEndpointCertificateMetadata() {
Map<ApplicationId, EndpointCertificateMetadata> allEndpointCertificateMetadata = new HashMap<>();
- Iterator<String> zkNodes = endpointCertificateRoot.iterator();
- while(zkNodes.hasNext()) {
- ApplicationId applicationId = ApplicationId.fromSerializedForm(zkNodes.next());
+
+ for (String appIdString : curator.getChildren(endpointCertificateRoot)) {
+ ApplicationId applicationId = ApplicationId.fromSerializedForm(appIdString);
Optional<EndpointCertificateMetadata> endpointCertificateMetadata = readEndpointCertificateMetadata(applicationId);
allEndpointCertificateMetadata.put(applicationId, endpointCertificateMetadata.orElseThrow());
}