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

[svnadmin at bedework.org]

Author: douglm
Date: 2008-05-12 15:38:02 -0400 (Mon, 12 May 2008)
New Revision: 749

Modified:
   trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
Log:
Fix up contact handling so we use public contacts in submission client.

Also rollback on exceptions in web client.

Modified: trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java	2008-05-12 19:35:51 UTC (rev 748)
+++ trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java	2008-05-12 19:38:02 UTC (rev 749)
@@ -335,10 +335,12 @@
     } catch (CalFacadeAccessException cfae) {
       form.getErr().emit(ClientError.noAccess);
       forward = forwards[forwardNoAccess];
+      svci.rollbackTransaction();
     } catch (Throwable t) {
       form.getErr().emit(ClientError.exc, t.getMessage());
       form.getErr().emit(t);
       forward = forwards[forwardError];
+      svci.rollbackTransaction();
     }
 
     return forward;
@@ -743,7 +745,7 @@
 
     CalSvcI svci = form.fetchSvci();
     Collection<BwCategory> cats = new TreeSet<BwCategory>();
-    Collection<BwCategory> dbcats = svci.getCategoriesHandler().get();
+    Collection<BwCategory> dbcats = form.getCategories();
 
     buildList:
     for (String catkey: strcats) {