[Bedework-commit] calendarapi r1383 - in releases/bedework-3.6: calCore/src/org/bedework/calcore/hibernate calFacade/src/org/bedework/calfacade

[svnadmin at bedework.org]

Author: douglm
Date: 2010-09-03 16:15:14 -0400 (Fri, 03 Sep 2010)
New Revision: 1383

Modified:
   releases/bedework-3.6/calCore/src/org/bedework/calcore/hibernate/HibSessionImpl.java
   releases/bedework-3.6/calFacade/src/org/bedework/calfacade/BwFreeBusyComponent.java
Log:
Changes to support ACCEPT header on GET
  * Will enable fetching of calendars and address books when targeting collections
  * Will be used by new web service to get XRD objects

Changes to XmlEmit to support better abbreviating of namespaces and better handling of default namespace. Also changes to handle some new xrd needs.

CalDAV server has partial support for CalWS - supports GET of XRD object.


Modified: releases/bedework-3.6/calCore/src/org/bedework/calcore/hibernate/HibSessionImpl.java
===================================================================
--- releases/bedework-3.6/calCore/src/org/bedework/calcore/hibernate/HibSessionImpl.java	2010-09-03 20:15:12 UTC (rev 1382)
+++ releases/bedework-3.6/calCore/src/org/bedework/calcore/hibernate/HibSessionImpl.java	2010-09-03 20:15:14 UTC (rev 1383)
@@ -35,6 +35,7 @@
 import org.hibernate.Criteria;
 import org.hibernate.FlushMode;
 import org.hibernate.LockMode;
+import org.hibernate.NonUniqueResultException;
 import org.hibernate.Query;
 import org.hibernate.ReplicationMode;
 import org.hibernate.SQLQuery;
@@ -620,6 +621,10 @@
       }
 
       return crit.uniqueResult();
+    } catch (NonUniqueResultException nure) {
+      // Always bad news
+      handleException(nure);
+      return null;  // Don't get here
     } catch (Throwable t) {
       handleException(t);
       return null;  // Don't get here

Modified: releases/bedework-3.6/calFacade/src/org/bedework/calfacade/BwFreeBusyComponent.java
===================================================================
--- releases/bedework-3.6/calFacade/src/org/bedework/calfacade/BwFreeBusyComponent.java	2010-09-03 20:15:12 UTC (rev 1382)
+++ releases/bedework-3.6/calFacade/src/org/bedework/calfacade/BwFreeBusyComponent.java	2010-09-03 20:15:14 UTC (rev 1383)
@@ -57,6 +57,7 @@
 
   private int type = typeBusy;
 
+  /** */
   public static final String[] fbtypes = {"BUSY",
                                           "FREE",
                                           "BUSY-UNAVAILABLE",