Author: rfm
Date: Mon Feb 15 12:07:44 2016
New Revision: 39374
URL: http://svn.gna.org/viewcvs/gnustep?rev=39374&view=rev
Log:
Fixup for mistake in earlier commit
Modified:
libs/base/trunk/Source/NSThread.m
libs/base/trunk/Source/NSUserDefaults.m
Modified: libs/base/trunk/Source/NSThread.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSThread.m?rev=39374&r1=39373&r2=39374&view=diff
==============================================================================
--- libs/base/trunk/Source/NSThread.m (original)
+++ libs/base/trunk/Source/NSThread.m Mon Feb 15 12:07:44 2016
@@ -573,25 +573,28 @@
{
if (thread != defaultThread)
{
- CREATE_AUTORELEASE_POOL(arp);
NSValue *ref;
RETAIN((NSThread*)thread);
ref = NSValueCreateFromPthread(pthread_self());
_willLateUnregisterThread(ref, (NSThread*)thread);
- NS_DURING
- {
- unregisterActiveThread((NSThread*)thread);
- }
- NS_HANDLER
- {
- DESTROY(arp);
- _didLateUnregisterCurrentThread(ref);
- DESTROY(ref);
- RELEASE((NSThread*)thread);
- }
- NS_ENDHANDLER
- DESTROY(arp);
+
+ {
+ CREATE_AUTORELEASE_POOL(arp);
+ NS_DURING
+ {
+ unregisterActiveThread((NSThread*)thread);
+ }
+ NS_HANDLER
+ {
+ DESTROY(arp);
+ _didLateUnregisterCurrentThread(ref);
+ DESTROY(ref);
+ RELEASE((NSThread*)thread);
+ }
+ NS_ENDHANDLER
+ DESTROY(arp);
+ }
/* At this point threre shouldn't be any autoreleased objects lingering
* around anymore. So we may remove the thread from the lookup table.
Modified: libs/base/trunk/Source/NSUserDefaults.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSUserDefaults.m?rev=39374&r1=39373&r2=39374&view=diff
==============================================================================
--- libs/base/trunk/Source/NSUserDefaults.m (original)
+++ libs/base/trunk/Source/NSUserDefaults.m Mon Feb 15 12:07:44 2016
@@ -576,6 +576,7 @@
NSNumberClass = [NSNumber class];
NSMutableDictionaryClass = [NSMutableDictionary class];
NSStringClass = [NSString class];
+ argumentsDictionary = [NSDictionary new];
[self registerAtExit];
/* Initialise the defaults flags to take values from the
@@ -2340,12 +2341,11 @@
}
done = ((key = [enumerator nextObject]) == nil);
}
- argumentsDictionary = [argDict copy];
+ ASSIGNCOPY(argumentsDictionary, argDict);
[classLock unlock];
}
NS_HANDLER
{
- argumentsDictionary = [NSDictionary new];
[classLock unlock];
[localException raise];
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
