Author: bvahdat Date: Sun Aug 5 20:40:59 2012 New Revision: 1369677 URL: http://svn.apache.org/viewvc?rev=1369677&view=rev Log: Merged revisions 1369672 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1369672 | bvahdat | 2012-08-05 22:35:33 +0200 (So, 05 Aug 2012) | 9 lines Merged revisions 1369671 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1369671 | bvahdat | 2012-08-05 22:32:18 +0200 (So, 05 Aug 2012) | 1 line Polished. ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1369671 Merged /camel/branches/camel-2.10.x:r1369672 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java?rev=1369677&r1=1369676&r2=1369677&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java (original) +++ camel/branches/camel-2.9.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java Sun Aug 5 20:40:59 2012 @@ -44,7 +44,7 @@ public class MyBatisInsertWithRollbackTe return new RouteBuilder() { @Override public void configure() throws Exception { - onException(PersistenceException.class).handled(true) + onException(Exception.class).handled(true) .to("mock:rollback"); from("direct:start")
