Fix for ODBC-170. Error "Attempt to reopen an open cursor" may be rai…

…sed in Microsoft Access with Firebird 3
FirebirdSQL · Jan 5, 2014 · 59ea0d0 · 59ea0d0
1 parent 2c06093
commit 59ea0d0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/IscDbc/IscResultSet.cpp b/IscDbc/IscResultSet.cpp
@@ -247,11 +247,11 @@ void IscResultSet::close()
 	reset();
 
 	if (statement)
-		{
+	{
 		statement->deleteResultSet (this);
 		statement->release();
 		statement = NULL;
-		}
+	}
 }
 
 void IscResultSet::deleteBlobs()

diff --git a/IscDbc/IscStatement.cpp b/IscDbc/IscStatement.cpp
@@ -549,14 +549,6 @@ void IscStatement::deleteResultSet(IscResultSet * resultSet)
 
 		if ( connection )
 		{
-			if ( transactionLocal )
-			{
-				if ( transactionInfo.autoCommit )
-					commitLocal();
-			}
-			else if ( connection->transactionInfo.autoCommit )
-				connection->commitAuto();
-
 			if ( isActiveCursor )
 			{
 				// Close cursors too.
@@ -565,7 +557,15 @@ void IscStatement::deleteResultSet(IscResultSet * resultSet)
 				// Cursor already closed or not assigned
 				if ( statusVector[1] && statusVector[1] != 335544569)
 					THROW_ISC_EXCEPTION (connection, statusVector);
+			}			
+
+			if ( transactionLocal )
+			{
+				if ( transactionInfo.autoCommit )
+					commitLocal();
 			}
+			else if ( connection->transactionInfo.autoCommit )
+				connection->commitAuto();
 		}
 	}
 }