[Bedework-commit] webdav r149 - releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common

[svnadmin at bedework.org]

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

Modified:
   releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/GetMethod.java
   releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/PrincipalMatchReport.java
   releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/PropFindMethod.java
   releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/PropPatchMethod.java
   releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/ReportMethod.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/edu/rpi/cct/webdav/servlet/common/GetMethod.java
===================================================================
--- releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/GetMethod.java	2008-08-08 01:43:01 UTC (rev 148)
+++ releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/GetMethod.java	2008-08-13 04:30:55 UTC (rev 149)
@@ -139,12 +139,6 @@
         contentLength = node.getContentLen();
       }
 
-      if (doContent) {
-        out = resp.getWriter();
-      } else {
-        out = null;
-      }
-
       resp.setHeader("ETag", node.getEtagValue(true));
 
       if (node.getLastmodDate() != null) {
@@ -155,6 +149,12 @@
       resp.setContentLength(contentLength);
 
       if (doContent) {
+        out = resp.getWriter();
+      } else {
+        out = null;
+      }
+
+      if (doContent) {
         if (in == null) {
           if (debug) {
             debugMsg("status: " + HttpServletResponse.SC_NO_CONTENT);

Modified: releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/PrincipalMatchReport.java
===================================================================
--- releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/PrincipalMatchReport.java	2008-08-08 01:43:01 UTC (rev 148)
+++ releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/PrincipalMatchReport.java	2008-08-13 04:30:55 UTC (rev 149)
@@ -182,13 +182,13 @@
                       HttpServletResponse resp,
                       int depth) throws WebdavException {
     try {
+      resp.setStatus(WebdavStatusCode.SC_MULTI_STATUS);
+      resp.setContentType("text/xml; charset=UTF-8");
+
       XmlEmit xml = intf.getXmlEmit();
 
       xml.startEmit(resp.getWriter());
 
-      resp.setStatus(WebdavStatusCode.SC_MULTI_STATUS);
-      resp.setContentType("text/xml; charset=UTF-8");
-
       xml.openTag(WebdavTags.multistatus);
 
       String resourceUri = mb.getResourceUri(req);

Modified: releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/PropFindMethod.java
===================================================================
--- releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/PropFindMethod.java	2008-08-08 01:43:01 UTC (rev 148)
+++ releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/PropFindMethod.java	2008-08-13 04:30:55 UTC (rev 149)
@@ -138,8 +138,6 @@
       }
     }
 
-    startEmit(resp);
-
     processResp(req, resp, depth);
   }
 
@@ -228,6 +226,8 @@
     resp.setStatus(WebdavStatusCode.SC_MULTI_STATUS);
     resp.setContentType("text/xml; charset=UTF-8");
 
+    startEmit(resp);
+
     String resourceUri = getResourceUri(req);
     if (debug) {
       trace("About to get node at " + resourceUri);

Modified: releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/PropPatchMethod.java
===================================================================
--- releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/PropPatchMethod.java	2008-08-08 01:43:01 UTC (rev 148)
+++ releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/PropPatchMethod.java	2008-08-13 04:30:55 UTC (rev 149)
@@ -181,11 +181,12 @@
       }
 
       /* Fail whole request for any failure */
-      startEmit(resp);
 
       resp.setStatus(WebdavStatusCode.SC_MULTI_STATUS);
       resp.setContentType("text/xml; charset=UTF-8");
 
+      startEmit(resp);
+
       openTag(WebdavTags.multistatus);
 
       openTag(WebdavTags.response);

Modified: releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/ReportMethod.java
===================================================================
--- releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/ReportMethod.java	2008-08-08 01:43:01 UTC (rev 148)
+++ releases/bedework-3.4.1.1/server/src/edu/rpi/cct/webdav/servlet/common/ReportMethod.java	2008-08-13 04:30:55 UTC (rev 149)
@@ -387,11 +387,11 @@
 
     Collection<String> hrefs = intf.getAclPrincipalInfo(node);
 
-    startEmit(resp);
-
     resp.setStatus(WebdavStatusCode.SC_MULTI_STATUS);
     resp.setContentType("text/xml; charset=UTF-8");
 
+    startEmit(resp);
+
     openTag(WebdavTags.multistatus);
     if (!hrefs.isEmpty()) {
       openTag(WebdavTags.response);
@@ -424,11 +424,11 @@
                                               HttpServletResponse resp,
                                               int depth,
                                               WebdavNsIntf intf) throws WebdavException {
-    startEmit(resp);
-
     resp.setStatus(WebdavStatusCode.SC_MULTI_STATUS);
     resp.setContentType("text/xml; charset=UTF-8");
 
+    startEmit(resp);
+
     String resourceUri = getResourceUri(req);
 
     Collection<? extends WebdavNsNode> principals = intf.getPrincipals(resourceUri, pps);