[camel] branch main updated: CAMEL-16632: camel-salesforce - NPE On Processing Composite Collections Response

[davsclaus]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 5ddd287  CAMEL-16632: camel-salesforce - NPE On Processing Composite 
Collections Response
5ddd287 is described below

commit 5ddd2876d1596ef58d6c8dad42c5ffaa99290df0
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jun 4 17:38:13 2021 +0200

    CAMEL-16632: camel-salesforce - NPE On Processing Composite Collections 
Response
---
 .../processor/CompositeSObjectCollectionsProcessor.java    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/CompositeSObjectCollectionsProcessor.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/CompositeSObjectCollectionsProcessor.java
index d811f5b..e352818 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/CompositeSObjectCollectionsProcessor.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/CompositeSObjectCollectionsProcessor.java
@@ -180,14 +180,13 @@ public class CompositeSObjectCollectionsProcessor extends 
AbstractSalesforceProc
         try {
             if (!responseBody.isPresent()) {
                 exchange.setException(exception);
+            } else {
+                Message in = exchange.getIn();
+                Message out = exchange.getOut();
+                List<?> response = responseBody.get();
+                out.copyFromWithNewBody(in, response);
+                out.getHeaders().putAll(headers);
             }
-            final Message in = exchange.getIn();
-            final Message out = exchange.getOut();
-
-            final List<?> response = responseBody.get();
-
-            out.copyFromWithNewBody(in, response);
-            out.getHeaders().putAll(headers);
         } finally {
             callback.done(false);
         }
@@ -196,7 +195,6 @@ public class CompositeSObjectCollectionsProcessor extends 
AbstractSalesforceProc
     private boolean processException(final Exchange exchange, final 
AsyncCallback callback, final Exception e) {
         exchange.setException(e);
         callback.done(true);
-
         return true;
     }
 }