Author: dkulp
Date: Mon Oct 3 18:09:10 2011
New Revision: 1178483
URL: http://svn.apache.org/viewvc?rev=1178483&view=rev
Log:
Merged revisions 1177660 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1177660 | davsclaus | 2011-09-30 09:43:22 -0400 (Fri, 30 Sep 2011) | 1 line
catch Throwable just to be sure.
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java?rev=1178483&r1=1178482&r2=1178483&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
Mon Oct 3 18:09:10 2011
@@ -123,7 +123,7 @@ public class TransactionErrorHandler ext
} catch (TransactionRollbackException e) {
// ignore as its just a dummy exception to force spring TX to
rollback
log.debug("Transaction rollback ({}) for ExchangeId: {} due
exchange was marked for rollbackOnly", transactionKey,
exchange.getExchangeId());
- } catch (Exception e) {
+ } catch (Throwable e) {
log.warn("Transaction rollback (" + transactionKey + ") for
ExchangeId: " + exchange.getExchangeId() + " due exception: " + e.getMessage());
exchange.setException(e);
} finally {
