Author: bvahdat Date: Sat Aug 4 21:50:23 2012 New Revision: 1369481 URL: http://svn.apache.org/viewvc?rev=1369481&view=rev Log: Merged revisions 1369475 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1369475 | bvahdat | 2012-08-04 23:33:19 +0200 (Sa, 04 Aug 2012) | 9 lines Merged revisions 1369457 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1369457 | bvahdat | 2012-08-04 23:20:05 +0200 (Sa, 04 Aug 2012) | 1 line CAMEL-5485: camel-mybatis should do a proper transaction demarcation while reading/writing from/to database. ........ ................ Added: camel/branches/camel-2.9.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java - copied unchanged from r1369475, camel/branches/camel-2.10.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java Modified: camel/branches/camel-2.9.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java camel/branches/camel-2.9.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java Modified: camel/branches/camel-2.9.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java?rev=1369481&r1=1369480&r2=1369481&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java (original) +++ camel/branches/camel-2.9.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java Sat Aug 4 21:50:23 2012 @@ -28,14 +28,16 @@ public class DefaultMyBatisProcessingStr public void commit(MyBatisEndpoint endpoint, Exchange exchange, Object data, String consumeStatements) throws Exception { SqlSession session = endpoint.getSqlSessionFactory().openSession(); - String[] statements = consumeStatements.split(","); try { for (String statement : statements) { session.update(statement.trim(), data); } - } finally { session.commit(); + } catch (Exception e) { + session.rollback(); + throw e; + } finally { session.close(); } } @@ -43,7 +45,12 @@ public class DefaultMyBatisProcessingStr public List<?> poll(MyBatisConsumer consumer, MyBatisEndpoint endpoint) throws Exception { SqlSession session = endpoint.getSqlSessionFactory().openSession(); try { - return session.selectList(endpoint.getStatement(), null); + List<Object> objects = session.selectList(endpoint.getStatement(), null); + session.commit(); + return objects; + } catch (Exception e) { + session.rollback(); + throw e; } finally { session.close(); } Modified: camel/branches/camel-2.9.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java?rev=1369481&r1=1369480&r2=1369481&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java (original) +++ camel/branches/camel-2.9.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java Sat Aug 4 21:50:23 2012 @@ -75,6 +75,10 @@ public class MyBatisProducer extends Def } doProcessResult(exchange, result); + session.commit(); + } catch (Exception e) { + session.rollback(); + throw e; } finally { session.close(); } @@ -95,6 +99,10 @@ public class MyBatisProducer extends Def } doProcessResult(exchange, result); + session.commit(); + } catch (Exception e) { + session.rollback(); + throw e; } finally { session.close(); } @@ -120,12 +128,13 @@ public class MyBatisProducer extends Def result = session.insert(statement); doProcessResult(exchange, result); } + + session.commit(); + } catch (Exception e) { + session.rollback(); + throw e; } finally { - try { - session.commit(); - } finally { - session.close(); - } + session.close(); } } @@ -149,12 +158,13 @@ public class MyBatisProducer extends Def result = session.update(statement); doProcessResult(exchange, result); } + + session.commit(); + } catch (Exception e) { + session.rollback(); + throw e; } finally { - try { - session.commit(); - } finally { - session.close(); - } + session.close(); } } @@ -178,12 +188,13 @@ public class MyBatisProducer extends Def result = session.delete(statement); doProcessResult(exchange, result); } + + session.commit(); + } catch (Exception e) { + session.rollback(); + throw e; } finally { - try { - session.commit(); - } finally { - session.close(); - } + session.close(); } }
