Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x 73a657dc8 -> 7d30c2e8c
  refs/heads/master a5d3b7507 -> 19fcfa88b


CAMEL-11785: CompositeApiClient cannot handle null resposnestream

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/19fcfa88
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19fcfa88
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19fcfa88

Branch: refs/heads/master
Commit: 19fcfa88be0db40cd1217ca18c360146bb2d52af
Parents: a5d3b75
Author: GeorgeD <geor...@hgdeclfr002861.grp.haufemg.com>
Authored: Tue Sep 19 11:54:50 2017 +0200
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Tue Sep 19 13:35:45 2017 +0200

----------------------------------------------------------------------
 .../salesforce/internal/client/DefaultCompositeApiClient.java     | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/19fcfa88/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
----------------------------------------------------------------------
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
index 1337124..63755ab 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
@@ -240,6 +240,9 @@ public class DefaultCompositeApiClient extends 
AbstractClientBase implements Com
     }
 
     <T> Optional<T> tryToReadResponse(final Class<T> expectedType, final 
InputStream responseStream) {
+        if (responseStream == null) {           
+            return Optional.empty();
+        } 
         try {
             if (format == PayloadFormat.JSON) {
                 return Optional.of(fromJson(expectedType, responseStream));

Reply via email to