mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-24 04:01:16 +00:00
search bundles too
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@14468 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
2cf97deea2
commit
e1105af397
1 changed files with 12 additions and 9 deletions
|
@ -1356,12 +1356,15 @@ selfLockn,
|
|||
{
|
||||
//OK
|
||||
NSArray* array=nil;
|
||||
NSArray* allFrameworks=nil;
|
||||
NSMutableArray* allFrameworks=nil;
|
||||
LOGObjectFnStart();
|
||||
allFrameworks=[NSBundle allFrameworks];
|
||||
// NSDebugMLLog(@"gswcomponents",@"_allFrameworks=%@",_allFrameworks);
|
||||
allFrameworks=[[NSBundle allFrameworks] mutableCopy];
|
||||
[allFrameworks addObjectsFromArray:[NSBundle allBundles]];
|
||||
// NSDebugMLLog(@"gswcomponents",@"_allFrameworks=%@",_allFrameworks);
|
||||
array=[self lockedInitComponentBearingFrameworksFromBundleArray:allFrameworks];
|
||||
NSDebugMLLog(@"gswcomponents",@"array=%@",array);
|
||||
[allFrameworks release];
|
||||
|
||||
LOGObjectFnStop();
|
||||
return array;
|
||||
};
|
||||
|
@ -2449,12 +2452,12 @@ selfLockn,
|
|||
|
||||
NS_DURING
|
||||
{
|
||||
NSLog(@"Application : checkAppIfRefused");
|
||||
NSLog(@"Application : allSessionIDs = %@", [_sessionStore allSessionIDs]);
|
||||
// NSLog(@"Application : checkAppIfRefused");
|
||||
// NSLog(@"Application : allSessionIDs = %@", [_sessionStore allSessionIDs]);
|
||||
requestHandlerValues=[GSWComponentRequestHandler _requestHandlerValuesForRequest:aRequest];
|
||||
if (requestHandlerValues)
|
||||
{
|
||||
NSLog(@"Application : requestHandlerValues is set");
|
||||
// NSLog(@"Application : requestHandlerValues is set");
|
||||
|
||||
sessionID=[requestHandlerValues objectForKey:GSWKey_SessionID[GSWebNamingConv]];
|
||||
if (!sessionID)
|
||||
|
@ -2466,12 +2469,12 @@ selfLockn,
|
|||
}
|
||||
else
|
||||
{
|
||||
NSLog(@"Application : sessionID found : %@", sessionID);
|
||||
NSLog(@"Application : allSessionIDs = %@", [_sessionStore allSessionIDs]);
|
||||
// NSLog(@"Application : sessionID found : %@", sessionID);
|
||||
// NSLog(@"Application : allSessionIDs = %@", [_sessionStore allSessionIDs]);
|
||||
// check for existing session ID
|
||||
if (![_sessionStore containsSessionID:sessionID])
|
||||
{
|
||||
NSLog(@"Application : sessionStore does not contain _sessionID");
|
||||
// NSLog(@"Application : sessionStore does not contain _sessionID");
|
||||
if ([self isRefusingNewSessions])
|
||||
refuseRequest = YES;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue