[Firebird-checkins] CVS: firebird2/src/jrd/extds ExtDS.cpp, 1.19, 1.20

[Vlad K. <hv...@us...>]

Build Version :  T2.5.0.21382 Firebird 2.5 Alpha 1

(writeBuildNum.sh,v 1.21543 2008/11/18 09:29:56 hvlad Exp $ )

Update of /cvsroot/firebird/firebird2/src/jrd/extds
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14564/jrd/extds

Modified Files:
	ExtDS.cpp 
Log Message:
Corrections. Thanks to Claudio

Index: ExtDS.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/extds/ExtDS.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -b -U3 -r1.19 -r1.20
--- ExtDS.cpp	17 Nov 2008 12:30:28 -0000	1.19
+++ ExtDS.cpp	18 Nov 2008 09:29:56 -0000	1.20
@@ -371,9 +371,6 @@
 
 void Connection::clearTransactions(Jrd::thread_db *tdbb)
 {
-	Transaction **tran_ptr = m_transactions.begin();
-	Transaction **end = m_transactions.end();
-
 	while (m_transactions.getCount())
 	{
 		Transaction *tran = m_transactions[0];
@@ -406,10 +403,15 @@
 	const bool was_deleting = m_deleting;
 	m_deleting = true;
 
+	try {
 	clearStatements(tdbb);
 	clearTransactions(tdbb);
-
 	m_deleting = was_deleting;
+	} 
+	catch(...) {
+		m_deleting = was_deleting;
+		throw;
+	}
 
 	doDetach(tdbb);
 }