[Bedework-commit] caldav r285 - releases/bedework-3.4.1.1/server/src/org/bedework/caldav/server

[svnadmin at bedework.org]

Author: douglm
Date: 2008-08-13 00:30:49 -0400 (Wed, 13 Aug 2008)
New Revision: 285

Modified:
   releases/bedework-3.4.1.1/server/src/org/bedework/caldav/server/CaldavReportMethod.java
   releases/bedework-3.4.1.1/server/src/org/bedework/caldav/server/PostMethod.java
Log:
CalDAV content-type - we were getting the reader too early - content type was not set.

Modified: releases/bedework-3.4.1.1/server/src/org/bedework/caldav/server/CaldavReportMethod.java
===================================================================
--- releases/bedework-3.4.1.1/server/src/org/bedework/caldav/server/CaldavReportMethod.java	2008-08-08 01:42:55 UTC (rev 284)
+++ releases/bedework-3.4.1.1/server/src/org/bedework/caldav/server/CaldavReportMethod.java	2008-08-13 04:30:49 UTC (rev 285)
@@ -343,11 +343,11 @@
   public void processResp(HttpServletRequest req,
                           HttpServletResponse resp,
                           int depth) throws WebdavException {
-    startEmit(resp);
-
     resp.setStatus(WebdavStatusCode.SC_MULTI_STATUS);
     resp.setContentType("text/xml; charset=UTF-8");
 
+    startEmit(resp);
+
     String resourceUri = getResourceUri(req);
 
     CaldavBWIntf intf = (CaldavBWIntf)getNsIntf();

Modified: releases/bedework-3.4.1.1/server/src/org/bedework/caldav/server/PostMethod.java
===================================================================
--- releases/bedework-3.4.1.1/server/src/org/bedework/caldav/server/PostMethod.java	2008-08-08 01:42:55 UTC (rev 284)
+++ releases/bedework-3.4.1.1/server/src/org/bedework/caldav/server/PostMethod.java	2008-08-13 04:30:49 UTC (rev 285)
@@ -441,8 +441,6 @@
     ScheduleResult sr = intf.getSysi().schedule(ei);
     checkStatus(sr);
 
-    startEmit(resp);
-
     resp.setStatus(HttpServletResponse.SC_OK);
     resp.setContentType("text/xml; charset=UTF-8");
 
@@ -454,7 +452,9 @@
       openTag(CaldavTags.recipient);
       property(WebdavTags.href, srr.recipient);
       closeTag(CaldavTags.recipient);
+      startEmit(resp);
 
+
       setReqstat(srr.status);
       closeTag(CaldavTags.response);
     }
@@ -478,11 +478,11 @@
     }
     checkStatus(sr);
 
-    startEmit(resp);
-
     resp.setStatus(HttpServletResponse.SC_OK);
     resp.setContentType("text/xml; charset=UTF-8");
 
+    startEmit(resp);
+
     openTag(CaldavTags.scheduleResponse);
 
     for (ScheduleRecipientResult srr: sr.recipientResults) {