Monotone-Parent: 72e1b73ecd70270e80d3a060fabe219cfcdd21cd

Monotone-Revision: 9f8af75f69269845084162a8844a51cf065ae8fc

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-19T16:53:51
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,5 +1,10 @@
 2009-11-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoParentFolder.m (-subFolders): we raise the
+	exceptions we get only if the current request is a PROPFIND. This
+	avoids a useless restart of SOGo when the database is down during
+	the execution of other requests.
+
 	* Tools/sogo-tool.m (main): we now check that the SOGo
 	configuration is valid and consequently that the tool runs under
 	the same account as SOGo.

SoObjects/SOGo/SOGoParentFolder.m

@@ -30,6 +30,7 @@
 #import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WOMessage.h>
+#import <NGObjWeb/WORequest.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <GDLContentStore/GCSChannelManager.h>
 #import <GDLContentStore/GCSFolderManager.h>
@@ -422,9 +423,14 @@ static SoSecurityManager *sm = nil;
 {
   NSMutableArray *ma;
   NSException *error;
+  NSString *requestMethod;
+  BOOL isPropfind;
+
+  requestMethod = [[context request] method];
+  isPropfind = [requestMethod isEqualToString: @"PROPFIND"];
 
   error = [self initSubFolders];
-  if (error)
+  if (error && isPropfind)
     {
       /* We exceptionnally raise the exception here because doPROPFIND:
 	 will not care for errors in its response from
@@ -432,9 +438,9 @@ static SoSecurityManager *sm = nil;
 	 disappearance of user folders in the SOGo extensions. */
       [error raise];
     }
-  
+
   error = [self initSubscribedSubFolders];
-  if (error)
+  if (error && isPropfind)
     [error raise];
 
   ma = [NSMutableArray arrayWithArray: [subFolders allValues]];