[camel] branch master 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 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 6af48a7  CAMEL-15644: Fixed potential NPE in camel-salesforce.
6af48a7 is described below

commit 6af48a73b3c47b79bdb37b5aa46383ef0dabf27f
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 de1d43f..d776d57 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
@@ -357,7 +357,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) {