Removed redundant call to _NSFoundationUncaughtExceptionHandler and added else blocks to allow a set uncaught exception handler to NOT exit if capable of recovering.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29511 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
jonathanosx 2010-02-08 17:15:57 +00:00
parent 1412e70c06
commit dfdd5d3483
2 changed files with 14 additions and 6 deletions

View file

@ -1,3 +1,8 @@
2010-02-08 Jonathan Gillaspie <jonathan.gillaspie@testplant.com>
* Source/NSException.m
* Removed redundant call to _NSFoundationUncaughtExceptionHandler and added else blocks
to allow a set uncaught exception handler to NOT exit if capable of recovering.
2010-02-08 Richard Frith-Macdonald <rfm@gnu.org> 2010-02-08 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/Foundation/NSOperation.h: * Headers/Foundation/NSOperation.h:

View file

@ -774,7 +774,9 @@ callUncaughtHandler(id value)
{ {
(*_NSUncaughtExceptionHandler)(value); (*_NSUncaughtExceptionHandler)(value);
} }
_NSFoundationUncaughtExceptionHandler(value); else {
_NSFoundationUncaughtExceptionHandler(value);
}
} }
@implementation NSException @implementation NSException
@ -928,12 +930,13 @@ callUncaughtHandler(id value)
* behavior of MacOS-X). * behavior of MacOS-X).
* The standard handler is guaranteed to exit/abort. * The standard handler is guaranteed to exit/abort.
*/ */
_NSFoundationUncaughtExceptionHandler(self); //_NSFoundationUncaughtExceptionHandler(self);
} }
else {
thread->_exception_handler = handler->next; thread->_exception_handler = handler->next;
handler->exception = self; handler->exception = self;
longjmp(handler->jumpState, 1); longjmp(handler->jumpState, 1);
}
#endif #endif
} }