gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix loading resource data

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24147 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-11-21 18:15:47 +00:00
parent f8a3829fa8
commit 6cdd9fb156
1 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Source/NSURL.m
View file

@ -1363,31 +1363,18 @@ static unsigned urlAlign;
/**
* Loads the resource data for the represented URL and returns the result.
* The shouldUseCache flag determines whether an existing cached NSURLHandle
* can be used to provide the data.
* The shouldUseCache flag determines whether data previously retrieved by
* an existing NSURLHandle can be used to provide the data, or if it should
* be refetched.
*/
- (NSData*) resourceDataUsingCache: (BOOL)shouldUseCache
{
NSURLHandle *handle = [self URLHandleUsingCache: shouldUseCache];
NSURLHandle *handle = [self URLHandleUsingCache: YES];
NSData *data;
if (shouldUseCache == NO || [handle status] != NSURLHandleLoadSucceeded)
{
NSRunLoop *loop;
NSDate *future;
[self loadResourceDataNotifyingClient: self
usingCache: shouldUseCache];
/*
* Keep the runloop going until the load has completed (or failed).
*/
loop = [NSRunLoop currentRunLoop];
future = [NSDate distantFuture];
while ([handle status] == NSURLHandleLoadInProgress)
{
[loop runMode: NSDefaultRunLoopMode beforeDate: future];
}
[handle loadInForeground];
}
data = [handle availableResourceData];
return data;
@ -1464,9 +1451,7 @@ static unsigned urlAlign;
{
return NO;
}
[self loadResourceDataNotifyingClient: self
usingCache: YES];
if ([handle resourceData] == nil)
if ([handle loadInForeground] == nil)
{
return NO;
}