[Bedework-commit] caldav r550 - trunk/server/src/org/bedework/caldav/server/soap/calws

[svnadmin at bedework.org]

Author: douglm
Date: 2011-07-19 16:02:06 -0400 (Tue, 19 Jul 2011)
New Revision: 550

Modified:
   trunk/server/src/org/bedework/caldav/server/soap/calws/CalwsHandler.java
Log:
More SOAP work. Added etoken code, started changes to diff routines to handle new update.

Added test to take updated copy of event as input 

Modified: trunk/server/src/org/bedework/caldav/server/soap/calws/CalwsHandler.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/soap/calws/CalwsHandler.java	2011-07-15 20:04:54 UTC (rev 549)
+++ trunk/server/src/org/bedework/caldav/server/soap/calws/CalwsHandler.java	2011-07-19 20:02:06 UTC (rev 550)
@@ -764,6 +764,19 @@
         CaldavComponentNode compNode = (CaldavComponentNode)elNode;
         String etoken = ui.getEtoken();
 
+        if (etoken == null) {
+          // Why can this happen? minOccurs = 1
+          uir.setStatus(StatusType.ERROR);
+
+          ErrorResponseType er = new ErrorResponseType();
+
+          ErrorCodeType ec = new ErrorCodeType();
+          er.setError(of.createMissingEtoken(ec));
+          uir.setErrorResponse(er);
+          uir.setMessage("Missing token");
+          break updateItem;
+        }
+
         // XXX Just do a straight compare for the moment
 
         if (!etoken.equals(compNode.getEtokenValue())) {