Backport resourceData change

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/stable@24374 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2007-01-17 08:30:05 +00:00
parent 5c21b4d221
commit 0c3bc33da5
2 changed files with 18 additions and 14 deletions

View file

@ -1,3 +1,8 @@
2007-01-17 Richard Frith-Macdonald <rfm@gnu.org>
* NSURLHandle.m: Backport change to make sure resourceData method
returns an autoreleased object.
2007-01-14 Richard Frith-Macdonald <rfm@gnu.org>
* Version 1.13.1

View file

@ -526,24 +526,23 @@ static Class NSURLHandleClass = 0;
*/
- (NSData*) resourceData
{
if (_status == NSURLHandleLoadSucceeded)
if (_status != NSURLHandleLoadSucceeded)
{
return [self availableResourceData];
}
else if (_status == NSURLHandleLoadInProgress)
{
return nil;
}
else
{
NSData *d = [self loadInForeground];
if (d != nil)
if (_status == NSURLHandleLoadInProgress)
{
ASSIGNCOPY(_data, d);
return nil;
}
else
{
NSData *d = [self loadInForeground];
if (d != nil)
{
ASSIGNCOPY(_data, d);
}
}
return _data;
}
return [self availableResourceData];
}
/**