Author: davsclaus
Date: Tue Jan 31 13:29:18 2012
New Revision: 1238508
URL: http://svn.apache.org/viewvc?rev=1238508&view=rev
Log:
CAMEL-4961: Polished
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-jaxb/ (props changed)
camel/branches/camel-2.9.x/components/camel-jaxb/src/test/ (props changed)
camel/branches/camel-2.9.x/components/camel-jms/ (props changed)
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 31 13:29:18 2012
@@ -1 +1 @@
-/camel/trunk:1235643,1236639,1236667,1237666,1237807,1238225,1238229,1238387,1238463,1238477
+/camel/trunk:1235643,1236639,1236667,1237666,1237807,1238225,1238229,1238387,1238463,1238477,1238503
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Propchange: camel/branches/camel-2.9.x/components/camel-jaxb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 31 13:29:18 2012
@@ -1 +1 @@
-/camel/trunk/components/camel-jaxb:1235643,1236403-1236663,1236667,1237148,1237666,1237807,1238225,1238229,1238387,1238463,1238477
+/camel/trunk/components/camel-jaxb:1235643,1236403-1236663,1236667,1237148,1237666,1237807,1238225,1238229,1238387,1238463,1238477,1238503
Propchange: camel/branches/camel-2.9.x/components/camel-jaxb/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 31 13:29:18 2012
@@ -1 +1 @@
-/camel/trunk/components/camel-jaxb/src/test:1235643,1236403-1236663,1236667,1237148,1237230,1237666,1237807,1238225,1238229,1238387,1238463,1238477
+/camel/trunk/components/camel-jaxb/src/test:1235643,1236403-1236663,1236667,1237148,1237230,1237666,1237807,1238225,1238229,1238387,1238463,1238477,1238503
Propchange: camel/branches/camel-2.9.x/components/camel-jms/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 31 13:29:18 2012
@@ -1 +1 @@
-/camel/trunk/components/camel-jms:1235643,1236639,1236667,1237666,1237807,1238060,1238225,1238229,1238387,1238463,1238477
+/camel/trunk/components/camel-jms:1235643,1236639,1236667,1237666,1237807,1238060,1238225,1238229,1238387,1238463,1238477,1238503
Modified:
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java?rev=1238508&r1=1238507&r2=1238508&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
Tue Jan 31 13:29:18 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
