[camel] branch camel-3.4.x updated: [CAMEL-15328]Honor Optional http headers as method parameters to be null in camel-cxfrs producer

[ffang]

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

ffang 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 d903289  [CAMEL-15328]Honor Optional http headers as method parameters 
to be null in camel-cxfrs producer
d903289 is described below

commit d90328928673c28318caf62b75f37f76e056cdac
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Wed Jul 22 12:32:50 2020 -0400

    [CAMEL-15328]Honor Optional http headers as method parameters to be null in 
camel-cxfrs producer
    
    (cherry picked from commit b21991b1043d85a1a3a29614fb074f0925fc914a)
---
 .../java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
index 0d57864..4c4d227 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
@@ -512,7 +512,7 @@ public class CxfRsProducer extends DefaultAsyncProducer {
                         continue;
                     }
                     for (int i = 0; i < parameterTypes.length; i++) {
-                        if (!params[i].isAssignableFrom(parameterTypes[i])) {
+                        if (parameterTypes[i] != null && 
!params[i].isAssignableFrom(parameterTypes[i])) {
                             continue iterate_on_methods;
                         }
                     }
@@ -535,7 +535,11 @@ public class CxfRsProducer extends DefaultAsyncProducer {
         Class<?>[] answer = new Class[objects.length];
         int i = 0;
         for (Object obj : objects) {
-            answer[i] = obj.getClass();
+            if (obj == null) {
+                answer[i] = null;
+            } else {
+                answer[i] = obj.getClass();
+            }
             i++;
         }
         return answer;