mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
* Source/GSXML.m (fatalErrorFunction): Use correct function to get
line number. * Source/NSOperation.m (_execute): Surround with NS_DURING to free lock on error.
This commit is contained in:
parent
4a5db5621f
commit
d774dda8a7
3 changed files with 15 additions and 1 deletions
|
@ -1,3 +1,10 @@
|
|||
2019-01-07 Fred Kiefer <fredkiefer@gmx.de>
|
||||
|
||||
* Source/GSXML.m (fatalErrorFunction): Use correct function to get
|
||||
line number.
|
||||
* Source/NSOperation.m (_execute): Surround with NS_DURING to free
|
||||
lock on error.
|
||||
|
||||
2019-06-11 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Headers/GNUstepBase/GSIArray.h:
|
||||
|
|
|
@ -3177,7 +3177,7 @@ warningFunction(void *ctx, const unsigned char *msg, ...)
|
|||
va_end(args);
|
||||
|
||||
NSCAssert(ctx,@"No Context");
|
||||
lineNumber = getLineNumber(ctx);
|
||||
lineNumber = xmlSAX2GetLineNumber(ctx);
|
||||
colNumber = xmlSAX2GetColumnNumber(ctx);
|
||||
[HANDLER warning: estr
|
||||
colNumber: colNumber
|
||||
|
|
|
@ -1000,6 +1000,7 @@ static NSOperationQueue *mainQueue = nil;
|
|||
max = maxConcurrent;
|
||||
}
|
||||
|
||||
NS_DURING
|
||||
while (NO == [self isSuspended]
|
||||
&& max > internal->executing
|
||||
&& [internal->waiting count] > 0)
|
||||
|
@ -1047,6 +1048,12 @@ static NSOperationQueue *mainQueue = nil;
|
|||
[internal->cond unlockWithCondition: 1];
|
||||
}
|
||||
}
|
||||
NS_HANDLER
|
||||
{
|
||||
[internal->lock unlock];
|
||||
[localException raise];
|
||||
}
|
||||
NS_ENDHANDLER
|
||||
[internal->lock unlock];
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue