fixed an issue in the WebDAV dispatcher

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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 19247a24307aad84afc61aba3e48432044e4020d..6ebafbc8c654942685f22eb4c285299db9f33a74 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-06  Helge Hess  <helge.hess@opengroupware.org>
+
+       * WebDAV/SoObjectWebDAVDispatcher.m: fixed an issue when trying to call
+         a WebDAV method on an object (v4.5.168)
+
 2005-06-26  Helge Hess  <helge.hess@opengroupware.org>
 
        * v4.5.167

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index ad9ca6c9636cc20a552ad26dd29735699060ec73..ea793f0da742093c2c4a71e42f1010cb7b4d0b40 100644 (file)
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=167
+SUBMINOR_VERSION:=168
 
 # v4.5.122 requires libNGExtensions v4.5.153
 # v4.5.91  requires libNGExtensions v4.5.134

diff --git a/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m b/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
index 80c157f5c57c02e9a2298b73788f7d35e0bdb24f..c32ec8f17bf6402d7d20a49a68bed87ac8edff21 100644 (file)
--- a/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
@@ -30,6 +30,7 @@
 #include "SoDAVLockManager.h"
 #include "EOFetchSpecification+SoDAV.h"
 #include "WOContext+SoObjects.h"
+#include "NSException+HTTP.h"
 #include <NGObjWeb/WOApplication.h>
 #include <NGObjWeb/WORequest.h>
 #include <NGObjWeb/WOResponse.h>
@@ -160,8 +161,13 @@ static NSTimeZone                *gmt      = nil;
     [self->object lookupName:_method inContext:_ctx acquire:NO];
   if (![methodObject isNotNull])
     return nil;
-  if ([methodObject isKindOfClass:[NSException class]])
+  if ([methodObject isKindOfClass:[NSException class]]) {
+    if ([(NSException *)methodObject httpStatus] == 404) {
+      /* not found */
+      return nil;
+    }
     return methodObject;
+  }
   if ((e = [self->object validateName:_method inContext:_ctx]) != nil)
     return e;