You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/06/23 07:49:02 UTC

[camel] branch main updated (ad96469871f -> 6f55432dbbe)

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

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


    from ad96469871f Regen for commit dfa3480c11cdbcfac14587374e875ebd39fe5adf
     new 843bfc21d62 (chores) camel-core-processor: use log markers in the RoutingSlip
     new 6f55432dbbe (chores) camel-core-processor: remove unused code

The 2 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:
 .../main/java/org/apache/camel/processor/RoutingSlip.java  | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)


[camel] 01/02: (chores) camel-core-processor: use log markers in the RoutingSlip

Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 843bfc21d62075c3e01a43de42f20eba7bb7848e
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jun 22 16:06:16 2023 +0200

    (chores) camel-core-processor: use log markers in the RoutingSlip
---
 .../src/main/java/org/apache/camel/processor/RoutingSlip.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RoutingSlip.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RoutingSlip.java
index 1563a813c20..954c363f753 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -288,7 +288,7 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
                 FailedToCreateProducerException e = current.getException(FailedToCreateProducerException.class);
                 if (e != null) {
                     if (LOG.isDebugEnabled()) {
-                        LOG.debug("Endpoint uri is invalid: " + endpoint + ". This exception will be ignored.", e);
+                        LOG.debug("Endpoint uri is invalid: {}. This exception will be ignored.", endpoint, e);
                     }
                     current.setException(null);
                 }
@@ -364,7 +364,7 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
                     : ExchangeHelper.resolveEndpoint(exchange, recipient);
         } catch (Exception e) {
             if (isIgnoreInvalidEndpoints()) {
-                LOG.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e);
+                LOG.debug("Endpoint uri is invalid: {}. This exception will be ignored.", recipient, e);
             } else {
                 throw e;
             }
@@ -461,7 +461,7 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
                                 FailedToCreateProducerException e = current.getException(FailedToCreateProducerException.class);
                                 if (e != null) {
                                     if (LOG.isDebugEnabled()) {
-                                        LOG.debug("Endpoint uri is invalid: " + endpoint + ". This exception will be ignored.",
+                                        LOG.debug("Endpoint uri is invalid: {}. This exception will be ignored.", endpoint,
                                                 e);
                                     }
                                     current.setException(null);


[camel] 02/02: (chores) camel-core-processor: remove unused code

Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 6f55432dbbe23ad8abd4b9dfa0f3c5fc2517cbab
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jun 22 16:06:51 2023 +0200

    (chores) camel-core-processor: remove unused code
---
 .../src/main/java/org/apache/camel/processor/RoutingSlip.java     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RoutingSlip.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RoutingSlip.java
index 954c363f753..5cec27897ea 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RoutingSlip.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RoutingSlip.java
@@ -26,7 +26,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePropertyKey;
 import org.apache.camel.Expression;
 import org.apache.camel.FailedToCreateProducerException;
-import org.apache.camel.Message;
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.Route;
 import org.apache.camel.Traceable;
@@ -568,13 +567,6 @@ public class RoutingSlip extends AsyncProcessorSupport implements Traceable, IdA
         return producerCache.getEndpointUtilizationStatistics();
     }
 
-    /**
-     * Returns the outbound message if available. Otherwise return the inbound message.
-     */
-    private Message getResultMessage(Exchange exchange) {
-        return exchange.getMessage();
-    }
-
     /**
      * Creates the embedded processor to use when wrapping this routing slip in an error handler.
      */