浏览代码

!36 counter = 0 时候会连续执行2次 executeBatch
Merge pull request !36 from xiyoufang/master

xiyoufang 7 年之前
父节点
当前提交
e9616b6dde
共有 1 个文件被更改,包括 21 次插入15 次删除
  1. 21 15
      src/main/java/com/jfinal/plugin/activerecord/DbPro.java

+ 21 - 15
src/main/java/com/jfinal/plugin/activerecord/DbPro.java

@@ -926,11 +926,13 @@ public class DbPro {
 					result[pointer++] = r[k];
 			}
 		}
-		int[] r = pst.executeBatch();
-		if (isInTransaction == false)
-			conn.commit();
-		for (int k=0; k<r.length; k++)
-			result[pointer++] = r[k];
+		if (counter != 0) {
+			int[] r = pst.executeBatch();
+			if (isInTransaction == false)
+				conn.commit();
+			for (int k = 0; k < r.length; k++)
+				result[pointer++] = r[k];
+		}
 		DbKit.close(pst);
 		return result;
 	}
@@ -1012,11 +1014,13 @@ public class DbPro {
 					result[pointer++] = r[k];
 			}
 		}
-		int[] r = pst.executeBatch();
-		if (isInTransaction == false)
-			conn.commit();
-		for (int k=0; k<r.length; k++)
-			result[pointer++] = r[k];
+		if (counter != 0) {
+			int[] r = pst.executeBatch();
+			if (isInTransaction == false)
+				conn.commit();
+			for (int k = 0; k < r.length; k++)
+				result[pointer++] = r[k];
+		}
 		DbKit.close(pst);
 		return result;
 	}
@@ -1074,11 +1078,13 @@ public class DbPro {
 					result[pointer++] = r[k];
 			}
 		}
-		int[] r = st.executeBatch();
-		if (isInTransaction == false)
-			conn.commit();
-		for (int k=0; k<r.length; k++)
-			result[pointer++] = r[k];
+		if (counter != 0) {
+			int[] r = st.executeBatch();
+			if (isInTransaction == false)
+				conn.commit();
+			for (int k = 0; k < r.length; k++)
+				result[pointer++] = r[k];
+		}
 		DbKit.close(st);
 		return result;
 	}