FlushBatchCursors did not remove cursors with no pendingRecords (#356)

* FlushBatchCursors did not remove cursors with no pendingRecords

* Remove unnecessary parameter.

* Remove unnecessary parameter.

Author: claudiamurialdo

android/src/main/java/com/genexus/db/driver/GXConnection.java

@@ -660,20 +660,32 @@ private void commit_impl() throws SQLException
 
 	public void flushBatchCursors(java.lang.Object o) throws SQLException{
 		Vector<Cursor> toRemove = new Vector();
+		log(GXDBDebug.LOG_MIN, "Scanning " + batchUpdateStmts.size() + " batch Stmts with pending updates");
 		for (int i = 0; i < batchUpdateStmts.size(); i++) {
 			BatchUpdateCursor cursor = (BatchUpdateCursor) batchUpdateStmts.get(i);
-			if (cursor.pendingRecords()) {
-				if (cursor.beforeCommitEvent(o))
-					toRemove.add(cursor);
+			if (cursor.isValidOwner(o)) {
+				if (cursor.pendingRecords()) {
+					cursor.beforeCommitEvent();
+				}
+				toRemove.add(cursor);
 			}
 		}
 		if (toRemove.size()>0)
 			batchUpdateStmts.removeAll(toRemove);
 	}
+	public void flushAllBatchCursors() throws SQLException{
+		log(GXDBDebug.LOG_MIN, "Scanning " + batchUpdateStmts.size() + " batch Stmts with pending updates");
+		for (int i = 0; i < batchUpdateStmts.size(); i++) {
+			BatchUpdateCursor cursor = (BatchUpdateCursor) batchUpdateStmts.get(i);
+			if (cursor.pendingRecords())
+				cursor.beforeCommitEvent();
+		}
+		batchUpdateStmts.clear();
+	}
 
     public void commit() throws SQLException
 	{
-		flushBatchCursors(null);
+		flushAllBatchCursors();
 
 		if	(DEBUG)
 		{

common/src/main/java/com/genexus/db/BatchUpdateCursor.java

@@ -205,16 +205,17 @@ public boolean pendingRecords() {
 		return mPreparedStatement.getRecordCount() > 0;
 	}
 
-	public boolean beforeCommitEvent(java.lang.Object o) throws SQLException {
+	public boolean isValidOwner(java.lang.Object o) throws SQLException {
+		return (o == null || o == mPreparedStatement.getOnCommitInstance());
+	}
+	public boolean beforeCommitEvent() throws SQLException {
 		boolean done = false;
-		if (o == null || o == mPreparedStatement.getOnCommitInstance()) {
-			try {
-				DynamicExecute.dynamicInstaceExecute(mPreparedStatement.getOnCommitInstance(),
-					mPreparedStatement.getOnCommitMethod(), null);
-				done = true;
-			} catch (Exception ex) {
-				throw new SQLException(ex.getMessage());
-			}
+		try {
+			DynamicExecute.dynamicInstaceExecute(mPreparedStatement.getOnCommitInstance(),
+				mPreparedStatement.getOnCommitMethod(), null);
+			done = true;
+		} catch (Exception ex) {
+			throw new SQLException(ex.getMessage());
 		}
 		return done;
 	}

java/src/main/java/com/genexus/db/driver/GXConnection.java

@@ -1016,20 +1016,32 @@ private void commit_impl() throws SQLException
 	}
 	public void flushBatchCursors(java.lang.Object o) throws SQLException{
 		Vector<Cursor> toRemove = new Vector();
+		log(GXDBDebug.LOG_MIN, "Scanning " + batchUpdateStmts.size() + " batch Stmts with pending updates");
 		for (int i = 0; i < batchUpdateStmts.size(); i++) {
 			BatchUpdateCursor cursor = (BatchUpdateCursor) batchUpdateStmts.get(i);
-			if (cursor.pendingRecords()) {
-				if (cursor.beforeCommitEvent(o))
-					toRemove.add(cursor);
+			if (cursor.isValidOwner(o)) {
+				if (cursor.pendingRecords()) {
+					cursor.beforeCommitEvent();
+				}
+				toRemove.add(cursor);
 			}
 		}
 		if (toRemove.size()>0)
 			batchUpdateStmts.removeAll(toRemove);
 	}
+	public void flushAllBatchCursors() throws SQLException{
+		log(GXDBDebug.LOG_MIN, "Scanning " + batchUpdateStmts.size() + " batch Stmts with pending updates");
+		for (int i = 0; i < batchUpdateStmts.size(); i++) {
+			BatchUpdateCursor cursor = (BatchUpdateCursor) batchUpdateStmts.get(i);
+			if (cursor.pendingRecords())
+				cursor.beforeCommitEvent();
+		}
+		batchUpdateStmts.clear();
+	}
 
     public void commit() throws SQLException
 	{
-		flushBatchCursors(null);
+		flushAllBatchCursors();
 
 		if	(DEBUG)
 		{