You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/11/06 16:12:17 UTC
[camel] 02/04: camel-jbang - Fix NPE in get vault
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c6de16a236d56887ae27240367df583cb42c32e7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Nov 6 10:53:48 2022 +0100
camel-jbang - Fix NPE in get vault
---
.../dsl/jbang/core/commands/process/ListVault.java | 30 +++++++++++-----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
index 1889304b9ee..edc78d5ed9e 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
@@ -100,22 +100,22 @@ public class ListVault extends ProcessBaseCommand {
rows.add(row);
}
}
- }
- JsonObject azure = (JsonObject) vaults.get("azure-secrets");
- if (azure != null) {
- row.vault = "Azure";
- row.lastCheck = azure.getLongOrDefault("lastCheckTimestamp", 0);
- row.lastReload = azure.getLongOrDefault("lastReloadTimestamp", 0);
- JsonArray arr = (JsonArray) azure.get("secrets");
- for (int i = 0; i < arr.size(); i++) {
- if (i > 0) {
- // create a copy for 2+ secrets
- row = row.copy();
+ JsonObject azure = (JsonObject) vaults.get("azure-secrets");
+ if (azure != null) {
+ row.vault = "Azure";
+ row.lastCheck = azure.getLongOrDefault("lastCheckTimestamp", 0);
+ row.lastReload = azure.getLongOrDefault("lastReloadTimestamp", 0);
+ JsonArray arr = (JsonArray) azure.get("secrets");
+ for (int i = 0; i < arr.size(); i++) {
+ if (i > 0) {
+ // create a copy for 2+ secrets
+ row = row.copy();
+ }
+ JsonObject jo = (JsonObject) arr.get(i);
+ row.secret = jo.getString("name");
+ row.timestamp = jo.getLongOrDefault("timestamp", 0);
+ rows.add(row);
}
- JsonObject jo = (JsonObject) arr.get(i);
- row.secret = jo.getString("name");
- row.timestamp = jo.getLongOrDefault("timestamp", 0);
- rows.add(row);
}
}
}