(camel) branch camel-4.18.x updated: Fix potential NPE in Camel Jbang Cli

[apupier]

This is an automated email from the ASF dual-hosted git repository.

apupier pushed a commit to branch camel-4.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-4.18.x by this push:
     new 9b4b129dd853 Fix potential NPE in Camel Jbang Cli
9b4b129dd853 is described below

commit 9b4b129dd853e798d963b00f0d116ee800f186cd
Author: Aurélien Pupier <apup...@ibm.com>
AuthorDate: Thu Sep 3 15:26:11 2026 +0200

    Fix potential NPE in Camel Jbang Cli
    
    backport of the NPE fix
    
https://github.com/apache/camel/commit/9831df4a650b4a8ca22fb0a752f2a6cb467046c1
    
    Signed-off-by: Aurélien Pupier <apup...@ibm.com>
---
 .../test/infra/cli/services/CliLocalContainerService.java      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
 
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
index 7fa52c20c0fe..e818ce6c92cb 100644
--- 
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
+++ 
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
@@ -218,10 +218,16 @@ public class CliLocalContainerService implements 
CliService, ContainerService<Cl
                 .orElseGet(() -> {
                     final String versionSummary = execute("version");
                     if (versionSummary.contains("User configuration") && 
versionSummary.contains("camel-version = ")) {
-                        version = StringHelper.between(versionSummary, 
"camel-version = ", "\n").trim();
+                        String v = StringHelper.between(versionSummary, 
"camel-version = ", "\n");
+                        if (v != null) {
+                            version = v.trim();
+                        }
                     }
                     if (version == null) {
-                        version = StringHelper.between(versionSummary, "Camel 
JBang version:", "\n").trim();
+                        String v = StringHelper.between(versionSummary, "Camel 
JBang version:", "\n");
+                        if (v != null) {
+                            version = v.trim();
+                        }
                     }
                     return version;
                 });