* GSWeb.framework/GSWDefaultAdaptorThread.m

([GSWDefaultAdaptorThread run:]): Replace NSThreadExiting
        with NSThreadWillExitNotification.
        ([GSWDefaultAdaptorThread threadExited:]): Ditto.
        ([GSWDefaultAdaptorThread readRequestReturnedRequestLine:
        returnedHeaders:returnedData:]): Assign current date to typed
        variable to avoid compiler warning on compare:.
        * GSWeb.framework/GSWUtils.m
        ([NSException exceptionWithName:format:]): Adapt variables name
        to not clash with instance variable names on Cocoa.
        ([NSException exceptionByAddingUserInfo:]): Ditto.
        ([NSException exceptionByAddingToUserInfoKey:format:]): Ditto.
        ([NSException exceptionByAddingUserInfoKey:format:]): Ditto.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18681 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ayers 2004-02-26 16:26:31 +00:00
parent 85d09b936c
commit 54bc7abdd4
3 changed files with 53 additions and 32 deletions

View file

@ -142,12 +142,12 @@ RCS_ID("$Id$")
forKey:GSWThreadKey_DefaultAdaptorThread];
[[NSNotificationCenter defaultCenter] addObserver:[self class]
selector:@selector(threadExited:)
name:NSThreadExiting//NSThreadWillExitNotification
name:NSThreadWillExitNotification
object:[NSThread currentThread]];
/*
[NotificationDispatcher addObserver:[self class]
selector:@selector(threadExited:)
name:NSThreadExiting//NSThreadWillExitNotification
name:NSThreadWillExitNotification
object:[NSThread currentThread]];
*/
};
@ -293,10 +293,10 @@ RCS_ID("$Id$")
NSDebugMLLog(@"low",@"adaptorThread=%@",adaptorThread);
[threadDict removeObjectForKey:GSWThreadKey_DefaultAdaptorThread];
[[NSNotificationCenter defaultCenter] removeObserver:self
name:NSThreadExiting//NSThreadWillExitNotification
name:NSThreadWillExitNotification
object:thread];
/* [NotificationDispatcher removeObserver:self
name:NSThreadExiting//NSThreadWillExitNotification
name:NSThreadWillExitNotification
object:_thread];
*/
[adaptorThread threadExited];
@ -522,11 +522,15 @@ RCS_ID("$Id$")
};
if (!isAllDataReaden)
{
isElapsed=[[NSDate date]compare:maxDate]==NSOrderedDescending;
/* Because +date returns (id) we use the variable
to insure the compiler finds the correct signature. */
NSDate *now = [NSDate date];
isElapsed =[now compare: maxDate]==NSOrderedDescending;
if (!isElapsed)
{
NSTimeIntervalSleep(sleepTime);//Is this the good method ? //TODOV
isElapsed=[[NSDate date]compare:maxDate]==NSOrderedDescending;
now = [NSDate date];
isElapsed=[now compare:maxDate]==NSOrderedDescending;
};
};
} while (!isAllDataReaden && !isElapsed);