You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2017/10/05 11:25:08 UTC
camel git commit: CAMEL-11884: NPE when stopping Salesforce compo...
Repository: camel
Updated Branches:
refs/heads/master 0ad3f6240 -> 44010a566
CAMEL-11884: NPE when stopping Salesforce compo...
...nent that failed to start
Adds a check to see if `config` is set in order to prevent NPE when
stopping.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/44010a56
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/44010a56
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/44010a56
Branch: refs/heads/master
Commit: 44010a5669052a6db762bd624976b10032b27250
Parents: 0ad3f62
Author: Zoran Regvart <zr...@apache.org>
Authored: Thu Oct 5 13:25:05 2017 +0200
Committer: Zoran Regvart <zr...@apache.org>
Committed: Thu Oct 5 13:25:05 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/salesforce/SalesforceComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/44010a56/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
----------------------------------------------------------------------
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 dd5b951..5b3dd9c 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
@@ -386,7 +386,7 @@ public class SalesforceComponent extends DefaultComponent implements VerifiableC
// shutdown http client connections
httpClient.stop();
// destroy http client if it was created by the component
- if (config.getHttpClient() == null) {
+ if (config != null && config.getHttpClient() == null) {
httpClient.destroy();
}
httpClient = null;