You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/31 14:26:24 UTC

svn commit: r1238503 - /camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java

Author: davsclaus
Date: Tue Jan 31 13:26:24 2012
New Revision: 1238503

URL: http://svn.apache.org/viewvc?rev=1238503&view=rev
Log:
CAMEL-4961: Polished

Modified:
    camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java

Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java?rev=1238503&r1=1238502&r2=1238503&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java Tue Jan 31 13:26:24 2012
@@ -112,9 +112,9 @@ public class TransactionErrorHandler ext
     }
 
     protected void processInTransaction(final Exchange exchange) throws Exception {
-        // is the exchange redeliveried, for example JMS brokers support such details
-        Boolean redelivery = exchange.isTransactedRedelivered();
-        final String redelivered = redelivery != null ? redelivery.toString() : "unknown";
+        // is the exchange redelivered, for example JMS brokers support such details
+        Boolean txRedelivered = exchange.isTransactedRedelivered();
+        final String redelivered = txRedelivered != null ? txRedelivered.toString() : "unknown";
         final String ids = ExchangeHelper.logIds(exchange);
 
         try {
@@ -153,7 +153,8 @@ public class TransactionErrorHandler ext
                     log.debug("Transaction rollback (" + transactionKey + ") redelivered(" + redelivered + ") for "
                         + ids + " due exchange was marked for rollbackOnlyLast and caught: ", cause);
                 } else {
-                    log.debug("Transaction rollback ({}) redelivered(" + redelivered + ") for {} due exchange was marked for rollbackOnlyLast", transactionKey, ids);
+                    log.debug("Transaction rollback ({}) redelivered({}) for {} "
+                            + "due exchange was marked for rollbackOnlyLast", new Object[]{transactionKey, redelivered, ids});
                 }
             }
             // remove caused exception due we was marked as rollback only last