2 files changed, 14 insertions, 13 deletions

diff --git a/java/MyMyBatis/src/AbstractDAO.java b/java/MyMyBatis/src/AbstractDAO.java
index 142b69f..22b4dce 100644
--- a/java/MyMyBatis/src/AbstractDAO.java
+++ b/java/MyMyBatis/src/AbstractDAO.java
@@ -26,7 +26,12 @@ public abstract class AbstractDAO<TObject, TMapper>
         public TRet call(TMapper m);
     }
 
-    protected int execInt(boolean commit, CallBack<Integer, TMapper> cb)
+    protected int execInt(CallBack<Integer, TMapper> cb)
+    {
+        return execInt(cb, false);
+    }
+
+    protected int execInt(CallBack<Integer, TMapper> cb, boolean commit)
     {
         int status = DAO_ERROR;
         SqlSession session = conn.openSqlSession();
@@ -42,32 +47,28 @@ public abstract class AbstractDAO<TObject, TMapper>
         return status;
     }
 
-    protected TObject execObject(boolean commit, CallBack<TObject, TMapper> cb)
+    protected TObject execObject(CallBack<TObject, TMapper> cb)
     {
         TObject obj = null;
         SqlSession session = conn.openSqlSession();
         try {
             obj = cb.call(session.getMapper(mapperClass));
-            if (commit) session.commit();
         }
         catch(PersistenceException e) {
-            if (commit) session.rollback();
             if (logErrors) conn.error(e);
         }
         finally { session.close(); }
         return obj;
     }
 
-    protected List<TObject> execObjects(boolean commit, CallBack<List<TObject>, TMapper> cb)
+    protected List<TObject> execObjects(CallBack<List<TObject>, TMapper> cb)
     {
         List<TObject> list = null;
         SqlSession session = conn.openSqlSession();
         try {
             list = cb.call(session.getMapper(mapperClass));
-            if (commit) session.commit();
         }
         catch(PersistenceException e) {
-            if (commit) session.rollback();
             if (logErrors) conn.error(e);
         }
         finally { session.close(); }
diff --git a/java/MyMyBatis/src/AbstractDAOOperations.java b/java/MyMyBatis/src/AbstractDAOOperations.java
index 6fcd6e4..5307641 100644
--- a/java/MyMyBatis/src/AbstractDAOOperations.java
+++ b/java/MyMyBatis/src/AbstractDAOOperations.java
@@ -7,31 +7,31 @@ public abstract class AbstractDAOOperations<TObject, TIdentity, TMapper extends
 
     public int insert(final TObject obj)
     {
-        return execInt(true, m -> m.insert(obj));
+        return execInt(m -> m.insert(obj), true);
     }
 
     public int update(final TObject obj)
     {
-        return execInt(true, m -> m.update(obj));
+        return execInt(m -> m.update(obj), true);
     }
 
     public int delete(final TObject obj)
     {
-        return execInt(true, m -> m.delete(obj));
+        return execInt(m -> m.delete(obj), true);
     }
 
     public int count()
     {
-        return execInt(false, m -> m.count());
+        return execInt(m -> m.count());
     }
 
     public List<TObject> select()
     {
-        return execObjects(false, m -> m.select());
+        return execObjects(m -> m.select());
     }
 
     public TObject selectOne(final TIdentity id)
     {
-        return execObject(false, m -> m.selectOne(id));
+        return execObject(m -> m.selectOne(id));
     }
 }