[camel] branch camel-3.4.x updated: CAMEL-15644: Fixed potential NPE in camel-salesforce.

[davsclaus]

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

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


The following commit(s) were added to refs/heads/camel-3.4.x by this push:
     new 0a42c7f  CAMEL-15644: Fixed potential NPE in camel-salesforce.
0a42c7f is described below

commit 0a42c7f4896c6567a47e689a7306d2c66643fc0c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Oct 6 20:22:35 2020 +0200

    CAMEL-15644: Fixed potential NPE in camel-salesforce.
---
 .../org/apache/camel/component/salesforce/SalesforceComponent.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 14a553f..f565745 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -338,7 +338,9 @@ public class SalesforceComponent extends DefaultComponent 
implements SSLContextP
             
sslContextFactory.setSslContext(contextParameters.createSSLContext(getCamelContext()));
 
             httpClient = createHttpClient(sslContextFactory);
-            getConfig().setHttpClient(httpClient);
+            if (config != null) {
+                config.setHttpClient(httpClient);
+            }
         }
 
         if (httpClientProperties == null) {