minor code cleanups

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1269 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m b/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m
index af29e83fd64e01c5e5bcc3836f6d3ab418083268..e3490e57ca3d336ac6e2479794221c6c4df1fbd6 100644 (file)
--- 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 7145ed0f9bbb3fc387623f5445002c5b3db7921e..3dbddd05357520d2d721865f3cf505d54faa9883 100644 (file)
--- 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 5f8e383c2fe1e21df7d8ea334bcf7e1e583f8379..718e51cfbf74f5c2868627dab8cdfc7f1e1820b7 100644 (file)
--- 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];
             }