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
The following commit(s) were added to refs/heads/main by this push:
new 3f721798f26 camel-jbang - Potential NPE if running camel cli goal
while camel is starting up
3f721798f26 is described below
commit 3f721798f262c4ce17f41767f29f3387af998776
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Sep 27 18:38:13 2022 +0200
camel-jbang - Potential NPE if running camel cli goal while camel is
starting up
---
.../org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java | 3 +++
.../camel/dsl/jbang/core/commands/process/CamelContextStatus.java | 3 +++
.../apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java | 3 +++
.../camel/dsl/jbang/core/commands/process/CamelEndpointStatus.java | 2 +-
.../camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java | 3 +++
.../apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java | 3 +++
.../org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java | 3 +++
.../org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java | 3 +++
.../org/apache/camel/dsl/jbang/core/commands/process/ListService.java | 3 +++
.../org/apache/camel/dsl/jbang/core/commands/process/ListVault.java | 3 +++
10 files changed, 28 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
index 98c65826b2e..f0c1e178921 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
@@ -102,6 +102,9 @@ public class LoggerAction extends ActionBaseCommand {
row.uptime = extractSince(ph);
row.ago = TimeUtils.printSince(row.uptime);
JsonObject context = (JsonObject) root.get("context");
+ if (context == null) {
+ return;
+ }
row.name = context.getString("name");
if ("CamelJBang".equals(row.name)) {
row.name = extractName(root, ph);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
index 13f51f96008..2c5b6f08d10 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
@@ -60,6 +60,9 @@ public class CamelContextStatus extends ProcessBaseCommand {
if (root != null) {
Row row = new Row();
JsonObject context = (JsonObject) root.get("context");
+ if (context == null) {
+ return;
+ }
row.name = context.getString("name");
if ("CamelJBang".equals(row.name)) {
row.name = extractName(root, ph);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
index a521d0b7287..6cdd5ae989e 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
@@ -60,6 +60,9 @@ public class CamelContextTop extends ProcessBaseCommand {
Row row = new Row();
rows.add(row);
JsonObject context = (JsonObject) root.get("context");
+ if (context == null) {
+ return;
+ }
row.name = context.getString("name");
if ("CamelJBang".equals(row.name)) {
row.name = extractName(root, ph);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelEndpointStatus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelEndpointStatus.java
index f45f77dee25..d3ecdccaf8d 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelEndpointStatus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelEndpointStatus.java
@@ -83,7 +83,7 @@ public class CamelEndpointStatus extends ProcessBaseCommand {
if (root != null) {
JsonObject context = (JsonObject) root.get("context");
JsonObject jo = (JsonObject) root.get("endpoints");
- if (jo != null) {
+ if (context != null && jo != null) {
JsonArray array = (JsonArray) jo.get("endpoints");
for (int i = 0; i < array.size(); i++) {
JsonObject o = (JsonObject) array.get(i);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java
index 5b28b795628..a41dd3971aa 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java
@@ -70,6 +70,9 @@ public class CamelProcessorStatus extends ProcessBaseCommand {
JsonObject root = loadStatus(ph.pid());
if (root != null) {
JsonObject context = (JsonObject) root.get("context");
+ if (context == null) {
+ return;
+ }
JsonArray array = (JsonArray) root.get("routes");
for (int i = 0; i < array.size(); i++) {
JsonObject o = (JsonObject) array.get(i);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
index 77ce7872dfa..298e1c42d12 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
@@ -73,6 +73,9 @@ public class CamelRouteStatus extends ProcessBaseCommand {
JsonObject root = loadStatus(ph.pid());
if (root != null) {
JsonObject context = (JsonObject) root.get("context");
+ if (context == null) {
+ return;
+ }
JsonArray array = (JsonArray) root.get("routes");
for (int i = 0; i < array.size(); i++) {
JsonObject o = (JsonObject) array.get(i);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
index fb81c23b36b..131dbea7659 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
@@ -63,6 +63,9 @@ public class ListEvent extends ProcessBaseCommand {
if (root != null) {
Row row = new Row();
JsonObject context = (JsonObject) root.get("context");
+ if (context == null) {
+ return;
+ }
row.name = context.getString("name");
if ("CamelJBang".equals(row.name)) {
row.name = extractName(root, ph);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java
index ee430899932..fc5f64f0e85 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java
@@ -60,6 +60,9 @@ public class ListProcess extends ProcessBaseCommand {
row.uptime = extractSince(ph);
row.ago = TimeUtils.printSince(row.uptime);
JsonObject context = (JsonObject) root.get("context");
+ if (context == null) {
+ return;
+ }
row.name = context.getString("name");
if ("CamelJBang".equals(row.name)) {
row.name = extractName(root, ph);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java
index bb61798b812..bf902787581 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java
@@ -59,6 +59,9 @@ public class ListService extends ProcessBaseCommand {
if (root != null) {
Row row = new Row();
JsonObject context = (JsonObject) root.get("context");
+ if (context == null) {
+ return;
+ }
row.name = context.getString("name");
if ("CamelJBang".equals(row.name)) {
row.name = extractName(root, ph);
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 a5851960e58..1889304b9ee 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
@@ -56,6 +56,9 @@ public class ListVault extends ProcessBaseCommand {
Row row = new Row();
row.pid = "" + ph.pid();
JsonObject context = (JsonObject) root.get("context");
+ if (context == null) {
+ return;
+ }
row.name = context.getString("name");
if ("CamelJBang".equals(row.name)) {
row.name = extractName(root, ph);
