Author: rfm
Date: Mon Jun 29 12:38:39 2015
New Revision: 38717
URL: http://svn.gna.org/viewcvs/gnustep?rev=38717&view=rev
Log:
fix deadlock
Modified:
libs/sqlclient/trunk/ChangeLog
libs/sqlclient/trunk/SQLClient.m
libs/sqlclient/trunk/SQLClientPool.m
Modified: libs/sqlclient/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/ChangeLog?rev=38717&r1=38716&r2=38717&view=diff
==============================================================================
--- libs/sqlclient/trunk/ChangeLog (original)
+++ libs/sqlclient/trunk/ChangeLog Mon Jun 29 12:38:39 2015
@@ -1,3 +1,11 @@
+2015-06-29 Richard Frith-Macdonald <[email protected]>
+
+ * SQLClient.h:
+ * SQLClient.m:
+ * SQLClientPool.m:
+ Implement another missing convenience method.
+ Fix locking error when executing a batch.
+
2015-06-27 Richard Frith-Macdonald <[email protected]>
* SQLClient.h:
Modified: libs/sqlclient/trunk/SQLClient.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/SQLClient.m?rev=38717&r1=38716&r2=38717&view=diff
==============================================================================
--- libs/sqlclient/trunk/SQLClient.m (original)
+++ libs/sqlclient/trunk/SQLClient.m Mon Jun 29 12:38:39 2015
@@ -3543,7 +3543,7 @@
if (_count > 0)
{
- NSRecursiveLock *dbLock = [_db _lock];
+ NSRecursiveLock *dbLock;
SQLClientPool *pool = nil;
SQLClient *db;
Modified: libs/sqlclient/trunk/SQLClientPool.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/SQLClientPool.m?rev=38717&r1=38716&r2=38717&view=diff
==============================================================================
--- libs/sqlclient/trunk/SQLClientPool.m (original)
+++ libs/sqlclient/trunk/SQLClientPool.m Mon Jun 29 12:38:39 2015
@@ -337,7 +337,7 @@
}
u[found] = YES;
t[found] = now;
- [lock unlockWithCondition: cond];
+ [self _unlock];
client = [c[found] autorelease];
if (_debugging > 2)
{
@@ -742,7 +742,7 @@
{
unsigned int index;
- [lock lock];
+ [self _lock];
for (index = 0; index < max; index++)
{
SQLClient *client = c[index];
@@ -759,7 +759,7 @@
[client setClientName: n];
}
}
- [lock unlock];
+ [self _unlock];
}
- (SQLTransaction*) transaction
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
