[camel] branch main updated: Fixed NPE triggered from an unit test

[davsclaus]

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 70e2a0bd04f Fixed NPE triggered from an unit test
70e2a0bd04f is described below

commit 70e2a0bd04ff00ebadeda0050a4caa24eb208c71
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Sep 8 11:57:55 2022 +0200

    Fixed NPE triggered from an unit test
---
 .../main/java/org/apache/camel/impl/engine/BasePackageScanResolver.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BasePackageScanResolver.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BasePackageScanResolver.java
index 50d5e34d8a1..cf5a8893fc8 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BasePackageScanResolver.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/BasePackageScanResolver.java
@@ -66,7 +66,7 @@ public abstract class BasePackageScanResolver extends 
ServiceSupport implements
         super.doInit();
 
         // ensure we also use app context class-loader
-        if (camelContext.getApplicationContextClassLoader() != null) {
+        if (camelContext != null && 
camelContext.getApplicationContextClassLoader() != null) {
             addClassLoader(camelContext.getApplicationContextClassLoader());
         }
     }