[camel] branch master updated: DefaultResourceLoader: fix NPE in fallback resolve

[lb...@apache.org]

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

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 8ab0024  DefaultResourceLoader: fix NPE in fallback resolve
8ab0024 is described below

commit 8ab002404b6aae6bf9de1b7f6db7b25de3ee1587
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Thu Mar 4 21:19:23 2021 +0100

    DefaultResourceLoader: fix NPE in fallback resolve
---
 .../java/org/apache/camel/impl/engine/DefaultResourceLoader.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceLoader.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceLoader.java
index 0cf16a8..0f0e35e 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceLoader.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultResourceLoader.java
@@ -59,13 +59,13 @@ public class DefaultResourceLoader extends ServiceSupport implements ResourceLoa
                 return super.resolve(DefaultResourceResolvers.ClasspathResolver.SCHEME + ":" + location);
             }
         };
+
+        this.fallbackResolver.setCamelContext(camelContext);
     }
 
     @Override
     public void doStart() throws Exception {
         super.doStart();
-
-        CamelContextAware.trySetCamelContext(this.fallbackResolver, getCamelContext());
         ServiceHelper.startService(this.fallbackResolver);
     }
 
@@ -94,6 +94,7 @@ public class DefaultResourceLoader extends ServiceSupport implements ResourceLoa
     @Override
     public void setCamelContext(CamelContext camelContext) {
         this.camelContext = camelContext;
+        this.fallbackResolver.setCamelContext(this.camelContext);
     }
 
     @Override