svn commit: r1325036 - /camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java

[cmueller]

Author: cmueller
Date: Wed Apr 11 22:00:51 2012
New Revision: 1325036

URL: http://svn.apache.org/viewvc?rev=1325036&view=rev
Log:
CAMEL-5161: If MyBatis experiences an error on commit (e.g. unique PK 
violation) it appears to hold the session open and cause DB writelock errors

Modified:
    
camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java

Modified: 
camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java?rev=1325036&r1=1325035&r2=1325036&view=diff
==============================================================================
--- 
camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
 (original)
+++ 
camel/trunk/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
 Wed Apr 11 22:00:51 2012
@@ -123,8 +123,11 @@ public class MyBatisProducer extends Def
                 doProcessResult(exchange, result);
             }
         } finally {
-            session.commit();
-            session.close();
+            try {
+                session.commit();
+            } finally {
+                session.close();                
+            }
         }
     }
 
@@ -145,8 +148,11 @@ public class MyBatisProducer extends Def
                 doProcessResult(exchange, result);
             }
         } finally {
-            session.commit();
-            session.close();
+            try {
+                session.commit();
+            } finally {
+                session.close();                
+            }
         }
     }
 
@@ -171,8 +177,11 @@ public class MyBatisProducer extends Def
                 doProcessResult(exchange, result);
             }
         } finally {
-            session.commit();
-            session.close();
+            try {
+                session.commit();
+            } finally {
+                session.close();                
+            }
         }
     }
 
@@ -197,8 +206,11 @@ public class MyBatisProducer extends Def
                 doProcessResult(exchange, result);
             }
         } finally {
-            session.commit();
-            session.close();
+            try {
+                session.commit();
+            } finally {
+                session.close();                
+            }
         }
     }