You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/08/04 23:33:20 UTC
svn commit: r1369475 - in /camel/branches/camel-2.10.x: ./
components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/
components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/
Author: bvahdat
Date: Sat Aug 4 21:33:19 2012
New Revision: 1369475
URL: http://svn.apache.org/viewvc?rev=1369475&view=rev
Log:
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.10.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java
- copied unchanged from r1369457, camel/trunk/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java
camel/branches/camel-2.10.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1369457
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java?rev=1369475&r1=1369474&r2=1369475&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java (original)
+++ camel/branches/camel-2.10.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/DefaultMyBatisProcessingStrategy.java Sat Aug 4 21:33:19 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.10.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java?rev=1369475&r1=1369474&r2=1369475&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java (original)
+++ camel/branches/camel-2.10.x/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java Sat Aug 4 21:33:19 2012
@@ -77,6 +77,10 @@ public class MyBatisProducer extends Def
}
doProcessResult(exchange, result);
+ session.commit();
+ } catch (Exception e) {
+ session.rollback();
+ throw e;
} finally {
session.close();
}
@@ -97,6 +101,10 @@ public class MyBatisProducer extends Def
}
doProcessResult(exchange, result);
+ session.commit();
+ } catch (Exception e) {
+ session.rollback();
+ throw e;
} finally {
session.close();
}
@@ -122,12 +130,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();
}
}
@@ -147,12 +156,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();
}
}
@@ -176,12 +186,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();
}
}
@@ -205,12 +216,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();
}
}