From 49ebdb2dd4e9dec9422664e483f0f5c7bfb08537 Mon Sep 17 00:00:00 2001 From: helge Date: Sun, 4 Jun 2006 20:01:37 +0000 Subject: [PATCH] minor code cleanups git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1269 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m | 2 +- sope-appserver/NGObjWeb/WOComponent.m | 4 ++-- sope-appserver/NGObjWeb/WORequestHandler.m | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m b/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m index af29e83f..e3490e57 100644 --- a/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m +++ b/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m @@ -638,7 +638,7 @@ static WOAssociation *yesAssoc = nil; if (self->subcomponentInfos == nil) self->subcomponentInfos = [[NSMutableArray alloc] initWithCapacity:16]; [self->subcomponentInfos addObject:info]; - RELEASE(info); + [info release]; info = nil; } - (NSArray *)subcomponentInfos { diff --git a/sope-appserver/NGObjWeb/WOComponent.m b/sope-appserver/NGObjWeb/WOComponent.m index 7145ed0f..3dbddd05 100644 --- a/sope-appserver/NGObjWeb/WOComponent.m +++ b/sope-appserver/NGObjWeb/WOComponent.m @@ -430,7 +430,7 @@ static inline id _getExtraVar(WOComponent *self, NSString *_key) { self->context = _ctx; } - (WOContext *)context { - if (self->context) + if (self->context != nil) return self->context; [self debugWithFormat: @@ -441,7 +441,7 @@ static inline id _getExtraVar(WOComponent *self, NSString *_key) { [self errorWithFormat:@"aborting, because ctx is missing !"]; abort(); } - + if (self->application == nil) self->application = [WOApplication application]; [self _setContext:[self->application context]]; diff --git a/sope-appserver/NGObjWeb/WORequestHandler.m b/sope-appserver/NGObjWeb/WORequestHandler.m index 5f8e383c..718e51cf 100644 --- a/sope-appserver/NGObjWeb/WORequestHandler.m +++ b/sope-appserver/NGObjWeb/WORequestHandler.m @@ -218,6 +218,7 @@ static NGLogger *perfLogger = nil; response =[app handleSessionRestorationErrorInContext:context]; } else { /* app refuses new sessions */ + // TODO: this already failed once, will it return null again? [self logWithFormat:@"app is refusing new sessions ..."]; response = [app handleSessionRestorationErrorInContext:context]; } -- 2.39.5