You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by on...@apache.org on 2017/07/26 18:57:21 UTC

camel git commit: CAMEL-5356 - treat if cxfExchange gives empty collection but not null

Repository: camel
Updated Branches:
  refs/heads/master 42903358b -> 98d346612


CAMEL-5356 - treat if cxfExchange gives empty collection but not null

CAMEL-5356 - cs fix


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

Branch: refs/heads/master
Commit: 98d346612430bb315141b2af45977d44a923b7df
Parents: 4290335
Author: onders86 <on...@gmail.com>
Authored: Wed Jul 26 15:42:17 2017 +0300
Committer: onders86 <on...@gmail.com>
Committed: Wed Jul 26 21:57:03 2017 +0300

----------------------------------------------------------------------
 .../java/org/apache/camel/component/cxf/DefaultCxfBinding.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/98d34661/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 90ac075..9389c92 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -747,7 +747,10 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
             }
             
             if (dataFormat == DataFormat.POJO) {
-                answer = message.getContent(List.class);  
+                List<?> pojoMessageList = message.getContent(List.class);  
+                if (pojoMessageList != null && !pojoMessageList.isEmpty()) {
+                    answer = pojoMessageList;
+                }
                 if (answer == null) {
                     answer = message.getContent(Object.class);
                     if (answer != null) {