fixed a small memleak, minor code cleanups

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index b4177f9f5e2a0670b50731a379a6318570a0359f..58f2e9f440618a154f218cbf9d1dcd0ed26f4a1d 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,5 +1,7 @@
 2005-03-25  Helge Hess  <helge.hess@opengroupware.org>
 
+       * WebDAV/SoObjectDataSource.m: fixed a small memory leak (v4.5.143)
+
        * SoObjects/SoObject+Traversal.m, WebDAV/SoObjectWebDAVDispatcher.m: 
          minor code cleanups (v4.5.142)
 

diff --git a/sope-appserver/NGObjWeb/SoObjects/SoObjectRequestHandler.m b/sope-appserver/NGObjWeb/SoObjects/SoObjectRequestHandler.m
index 57727f7f80bfef694631349334131b3b786c8828..2dc5b3245750138be2bb146c24f9fc458f58ea6c 100644 (file)
--- a/sope-appserver/NGObjWeb/SoObjects/SoObjectRequestHandler.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoObjectRequestHandler.m
@@ -451,7 +451,7 @@ static NSString *redirectURISafetySuffix = nil;
       }
     }
     
-    if (renderer)
+    if (renderer != nil)
       [self debugWithFormat:@"use rule-selected renderer: %@", renderer];
   }
   
@@ -682,6 +682,7 @@ static NSString *redirectURISafetySuffix = nil;
 
 @end /* SoObjectRequestHandler */
 
+
 @implementation WOCoreApplication(RendererSelection)
 
 - (id)rendererForObject:(id)_object inContext:(WOContext *)_ctx {
@@ -690,6 +691,7 @@ static NSString *redirectURISafetySuffix = nil;
 
 @end /* WOCoreApplication(RendererSelection) */
 
+
 @implementation SoObjectRequestHandler(Logging)
 
 - (NSString *)loggingPrefix {

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 11115ec31ca1819bb35d7605c26ab9937388c7e9..3bd975166be94d5e78b4aa5790010c046e3e76e7 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=142
+SUBMINOR_VERSION:=143
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134

diff --git a/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m b/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m
index 5e2898375312d74fd0a07ce2b791c45d5622db71..f32f9d133d224ab87c892c313a2fd82fd6638d84 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoObjectDataSource.m
@@ -54,6 +54,7 @@ static BOOL debugOn = NO;
 
 - (void)dealloc {
   [self->object release];
+  [self->fspec  release];
   [super dealloc];
 }
 
@@ -148,13 +149,13 @@ static BOOL debugOn = NO;
        e = nil;
     }
     else if ((child = [self->object lookupName:childKey inContext:_ctx 
-                          acquire:NO])==nil) {
+                                   acquire:NO]) == nil) {
       /* not found */
       [self debugWithFormat:@"  did not find key '%@'", childKey];
        
       if (!isBrief) { // when the brief header is not set, encode status
        NSDictionary *ui;
-         
+       
        ui = [NSDictionary dictionaryWithObject:@"404" /* not found */
                           forKey:@"http-status"];
        e = [NSException exceptionWithName:@"KeyError"
@@ -249,21 +250,16 @@ static BOOL debugOn = NO;
 - (NSArray *)fetchObjects {
   NSAutoreleasePool *pool;
   id result;
+
+  if ([[self fetchSpecification] davBulkTargetKeys] != nil) {
+    [self logWithFormat:@"SoObjectDataSource cannot handle bulk queries !"];
+    return nil;
+  }
   
   pool = [[NSAutoreleasePool alloc] init];
-  {
-    NSArray *keys;
-    
-    if ((keys = [[self fetchSpecification] davBulkTargetKeys])) {
-      [self logWithFormat:@"SoObjectDataSource cannot handle bulk queries !"];
-      return nil;
-    }
-    else {
-      result = [self davFlatQuery:[self fetchSpecification]
-                    inContext:[self context]];
-    }
-    result = [result retain];
-  }
+  result = [self davFlatQuery:[self fetchSpecification]
+                inContext:[self context]];
+  result = [result retain];
   [pool release];
   return [result autorelease];;
 }

diff --git a/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m b/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
index 496d9746236be18b6164b9092545980889914179..a269949d1465e1608a66b6b13b585a713e8f158f 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
@@ -255,10 +255,11 @@ static NSTimeZone                *gmt      = nil;
   e  = [sm validatePermission:SoPerm_DeleteObjects
           onObject:self->object
           inContext:_ctx];
-  if (e) return e;
-  if ((e = [self->object validateName:@"DELETE" inContext:_ctx]))
+  if (e != nil) 
     return e;
-
+  if ((e = [self->object validateName:@"DELETE" inContext:_ctx]) != nil)
+    return e;
+  
   // TODO: IE WebFolders sent a "Destroy" header together with the
   //       DELETE request, eg:
   //       "Destroy: NoUndelete"