gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-02-20 18:32:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

debug logging fix.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@25306 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2007-07-07 07:23:40 +00:00
parent 7332e2539a
commit 3dea330f47
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-07-07 Richard Frith-Macdonald <rfm@gnu.org>
* SQLClient.m: Fix error causing loss of some debug output when an
exception occurs in a transaction.
2007-04-01 Richard Frith-Macdonald <rfm@gnu.org> 2007-04-01 Richard Frith-Macdonald <rfm@gnu.org>
* SQLClient.h: * SQLClient.h:

7
SQLClient.m
View file

@ -1076,12 +1076,14 @@ static unsigned int maxConnections = 8;
{ {
[self simpleExecute: commitStatement]; [self simpleExecute: commitStatement];
_inTransaction = NO; _inTransaction = NO;
[_statements removeAllObjects];
[lock unlock]; // Locked at start of -commit [lock unlock]; // Locked at start of -commit
[lock unlock]; // Locked by -begin [lock unlock]; // Locked by -begin
} }
NS_HANDLER NS_HANDLER
{ {
_inTransaction = NO; _inTransaction = NO;
[_statements removeAllObjects];
[lock unlock]; // Locked at start of -commit [lock unlock]; // Locked at start of -commit
[lock unlock]; // Locked by -begin [lock unlock]; // Locked by -begin
[localException raise]; [localException raise];
@ -1557,6 +1559,7 @@ static unsigned int maxConnections = 8;
if (_inTransaction == YES) if (_inTransaction == YES)
{ {
_inTransaction = NO; _inTransaction = NO;
[_statements removeAllObjects];
NS_DURING NS_DURING
{ {
[self simpleExecute: rollbackStatement]; [self simpleExecute: rollbackStatement];
@ -1716,14 +1719,14 @@ static unsigned int maxConnections = 8;
} }
} }
} }
if (_inTransaction == NO || isCommit || isRollback) if (_inTransaction == NO)
{ {
[_statements removeAllObjects]; [_statements removeAllObjects];
} }
} }
NS_HANDLER NS_HANDLER
{ {
if (_inTransaction == NO || isCommit || isRollback) if (_inTransaction == NO)
{ {
[_statements removeAllObjects]; [_statements removeAllObjects];
} }