gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix logic error

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@7550 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2000-09-19 18:49:43 +00:00
parent 46575fd318
commit 3192c581c1
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Source/NSURLHandle.m
View file

@ -35,23 +35,27 @@ how it should work...
#include <Foundation/NSConcreteNumber.h>
#include <Foundation/NSURLHandle.h>
#include <Foundation/NSURL.h>
#include <Foundation/NSMapTable.h>
//=============================================================================
@implementation NSURLHandle
static NSMapTable *cache = 0;
static NSMutableArray *registry = nil;
+ (void) initialize
{
if (self == [NSURLHandle class])
{
cache = NSCreateMapTable(NSObjectMapKeyCallBacks,
NSObjectMapValueCallBacks, 0);
registry = [NSMutableArray new];
}
}
+ (void) registerURLHandleClass: (Class)_urlHandleSubclass
{
if ([registry indexOfObjectIdenticalTo: _urlHandleSubclass] != NSNotFound)
if ([registry indexOfObjectIdenticalTo: _urlHandleSubclass] == NSNotFound)
{
[registry addObject: _urlHandleSubclass];
}
@ -76,9 +80,19 @@ static NSMutableArray *registry = nil;
- (id) initWithURL: (NSURL*)_url
cached: (BOOL)_cached
{
Class concreteSubclass = [NSURLHandle URLHandleClassForURL: _url];
Class concreteSubclass;
NSURLHandle *instance;
if (_cached == YES)
{
instance = (id)NSMapGet(cache, (void*)_url);
if (instance != nil)
{
RELEASE(self);
return instance;
}
}
concreteSubclass = [NSURLHandle URLHandleClassForURL: _url];
if (concreteSubclass == 0)
{
NSLog(@"Attempt to init NSURLHandle with unsupported URL schema");
@ -86,7 +100,12 @@ static NSMutableArray *registry = nil;
}
RELEASE(self);
instance = [concreteSubclass alloc];
return [instance initWithURL: _url cached: _cached];
instance = [instance initWithURL: _url cached: _cached];
if (instance != nil)
{
NSMapInsert(cache, (void*)_url, (void*)instance);
}
return instance;
}
//-----------------------------------------------------------------------------
@ -152,8 +171,7 @@ static NSMutableArray *registry = nil;
//-----------------------------------------------------------------------------
- (void) flushCachedData
{
//FIXME
[self notImplemented: _cmd];
NSResetMapTable(cache);
}
//-----------------------------------------------------------------------------
@ -182,9 +200,7 @@ static NSMutableArray *registry = nil;
//-----------------------------------------------------------------------------
+ (NSURLHandle*) cachedHandleForURL: (NSURL*)_url
{
//FIXME
[self notImplemented: _cmd];
return nil;
return (NSURLHandle*) NSMapGet(cache, (void*)_url);
}
//-----------------------------------------------------------------------------