Fix for bug #2813

Alinto · Jun 16, 2014 · 50c0b49 · 50c0b49
1 parent 8202d05
commit 50c0b49
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/NEWS b/NEWS
@@ -13,6 +13,7 @@ Bug fixes
  - fixed the reply/forward operation over ActiveSync (#2805)
  - fixed regression when attaching files to a reply
  - wait 20 seconds (instead of 2) before deleting temporary download forms (#2811)
+ - avoid raising exceptions when the db is down and we try to access the preferences module (#2813)
 
 2.2.5 (2014-06-05)
 ------------------

diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -329,17 +329,24 @@ - (void) _fetchDisplayNameFromOwner
   fc = [cm acquireOpenChannelForURL: folderLocation];
   if (fc)
     {
-      sql
-	= [NSString stringWithFormat: (@"SELECT c_foldername FROM %@"
-				       @" WHERE c_path = '%@'"),
-		    [folderLocation gcsTableName], ocsPath];
-      [fc evaluateExpressionX: sql];
-      attrs = [fc describeResults: NO];
-      row = [fc fetchAttributes: attrs withZone: NULL];
-      if (row)
-	[self _setDisplayNameFromRow: row];
-      [fc cancelFetch];
-      [cm releaseChannel: fc];
+      // We use an exception handler here in case the database is down when
+      // performing the query. This could have unexpected results.
+      NS_DURING
+        {
+          sql
+            = [NSString stringWithFormat: (@"SELECT c_foldername FROM %@"
+                                           @" WHERE c_path = '%@'"),
+                        [folderLocation gcsTableName], ocsPath];
+          [fc evaluateExpressionX: sql];
+          attrs = [fc describeResults: NO];
+          row = [fc fetchAttributes: attrs withZone: NULL];
+          if (row)
+            [self _setDisplayNameFromRow: row];
+          [fc cancelFetch];
+          [cm releaseChannel: fc];
+        }
+      NS_HANDLER;
+      NS_ENDHANDLER;
     }
 }