[camel] branch CAMEL-19399/prevent-invalid-cache-enty-on-error updated (d4540072f73 -> 0855f5a43fc)

[nf...@apache.org]

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

nfilotto pushed a change to branch CAMEL-19399/prevent-invalid-cache-enty-on-error
in repository https://gitbox.apache.org/repos/asf/camel.git


 discard d4540072f73 CAMEL-19399: camel-cxf - Prevent storing invalid entry in Converter cache on error
     new 0855f5a43fc CAMEL-19399: camel-cxf - Don't add entry in Converter cache on error

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (d4540072f73)
            \
             N -- N -- N   refs/heads/CAMEL-19399/prevent-invalid-cache-enty-on-error (0855f5a43fc)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

[camel] 01/01: CAMEL-19399: camel-cxf - Don't add entry in Converter cache on error

[nf...@apache.org]

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

nfilotto pushed a commit to branch CAMEL-19399/prevent-invalid-cache-enty-on-error
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 0855f5a43fcef9d3ba18cfb5ea4bc59706d5ddd8
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Mon May 29 16:28:41 2023 +0200

    CAMEL-19399: camel-cxf - Don't add entry in Converter cache on error
---
 .../org/apache/camel/component/cxf/converter/CxfPayloadConverter.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
index e63ac48b80b..c984af7c958 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
@@ -179,6 +179,7 @@ public final class CxfPayloadConverter {
             } catch (RuntimeCamelException e) {
                 // the internal conversion to XML can throw an exception if the content is not XML
                 // ignore this and return MISS_VALUE to indicate that we cannot convert this
+                return (T) MISS_VALUE;
             }
             // Let other fallback converter try
             return null;