[Bedework-commit] webapps r1155 - trunk/webcommon/src/org/bedework/webcommon/event

[svnadmin at bedework.org]

Author: douglm
Date: 2010-03-05 14:50:40 -0500 (Fri, 05 Mar 2010)
New Revision: 1155

Modified:
   trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
Log:
When climbing up the tree as we add categories to an event via an alias, stop if we get a no access exception, don't fail.

Fixes http://bedework.org/trac/bedework/ticket/568

Modified: trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2010-03-05 16:58:02 UTC (rev 1154)
+++ trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2010-03-05 19:50:40 UTC (rev 1155)
@@ -36,6 +36,7 @@
 import org.bedework.calfacade.BwLocation;
 import org.bedework.calfacade.BwOrganizer;
 import org.bedework.calfacade.BwXproperty;
+import org.bedework.calfacade.exc.CalFacadeAccessException;
 import org.bedework.calfacade.exc.CalFacadeException;
 import org.bedework.calfacade.exc.ValidationError;
 import org.bedework.calfacade.svc.EventInfo;
@@ -671,9 +672,14 @@
       }
 
       while (curCol != null) {
-        curCol = svci.getCalendarsHandler().get(curCol.getColPath());
-        if (curCol != null) {
-          cats.addAll(curCol.getCategories());
+        try {
+          curCol = svci.getCalendarsHandler().get(curCol.getColPath());
+          if (curCol != null) {
+            cats.addAll(curCol.getCategories());
+          }
+        } catch (CalFacadeAccessException cfae) {
+          // We'll assume that's OK. We'll get that for /user at least.
+          break;
         }
       }
     }