mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-05-06 05:10:40 +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
1faebcfe9f
commit
fbb4ae45ba
1 changed files with 12 additions and 9 deletions
|
@ -1356,12 +1356,15 @@ selfLockn,
|
||||||
{
|
{
|
||||||
//OK
|
//OK
|
||||||
NSArray* array=nil;
|
NSArray* array=nil;
|
||||||
NSArray* allFrameworks=nil;
|
NSMutableArray* allFrameworks=nil;
|
||||||
LOGObjectFnStart();
|
LOGObjectFnStart();
|
||||||
allFrameworks=[NSBundle allFrameworks];
|
allFrameworks=[[NSBundle allFrameworks] mutableCopy];
|
||||||
|
[allFrameworks addObjectsFromArray:[NSBundle allBundles]];
|
||||||
// NSDebugMLLog(@"gswcomponents",@"_allFrameworks=%@",_allFrameworks);
|
// NSDebugMLLog(@"gswcomponents",@"_allFrameworks=%@",_allFrameworks);
|
||||||
array=[self lockedInitComponentBearingFrameworksFromBundleArray:allFrameworks];
|
array=[self lockedInitComponentBearingFrameworksFromBundleArray:allFrameworks];
|
||||||
NSDebugMLLog(@"gswcomponents",@"array=%@",array);
|
NSDebugMLLog(@"gswcomponents",@"array=%@",array);
|
||||||
|
[allFrameworks release];
|
||||||
|
|
||||||
LOGObjectFnStop();
|
LOGObjectFnStop();
|
||||||
return array;
|
return array;
|
||||||
};
|
};
|
||||||
|
@ -2449,12 +2452,12 @@ selfLockn,
|
||||||
|
|
||||||
NS_DURING
|
NS_DURING
|
||||||
{
|
{
|
||||||
NSLog(@"Application : checkAppIfRefused");
|
// NSLog(@"Application : checkAppIfRefused");
|
||||||
NSLog(@"Application : allSessionIDs = %@", [_sessionStore allSessionIDs]);
|
// NSLog(@"Application : allSessionIDs = %@", [_sessionStore allSessionIDs]);
|
||||||
requestHandlerValues=[GSWComponentRequestHandler _requestHandlerValuesForRequest:aRequest];
|
requestHandlerValues=[GSWComponentRequestHandler _requestHandlerValuesForRequest:aRequest];
|
||||||
if (requestHandlerValues)
|
if (requestHandlerValues)
|
||||||
{
|
{
|
||||||
NSLog(@"Application : requestHandlerValues is set");
|
// NSLog(@"Application : requestHandlerValues is set");
|
||||||
|
|
||||||
sessionID=[requestHandlerValues objectForKey:GSWKey_SessionID[GSWebNamingConv]];
|
sessionID=[requestHandlerValues objectForKey:GSWKey_SessionID[GSWebNamingConv]];
|
||||||
if (!sessionID)
|
if (!sessionID)
|
||||||
|
@ -2466,12 +2469,12 @@ selfLockn,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
NSLog(@"Application : sessionID found : %@", sessionID);
|
// NSLog(@"Application : sessionID found : %@", sessionID);
|
||||||
NSLog(@"Application : allSessionIDs = %@", [_sessionStore allSessionIDs]);
|
// NSLog(@"Application : allSessionIDs = %@", [_sessionStore allSessionIDs]);
|
||||||
// check for existing session ID
|
// check for existing session ID
|
||||||
if (![_sessionStore containsSessionID:sessionID])
|
if (![_sessionStore containsSessionID:sessionID])
|
||||||
{
|
{
|
||||||
NSLog(@"Application : sessionStore does not contain _sessionID");
|
// NSLog(@"Application : sessionStore does not contain _sessionID");
|
||||||
if ([self isRefusingNewSessions])
|
if ([self isRefusingNewSessions])
|
||||||
refuseRequest = YES;
|
refuseRequest = YES;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue