jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r385506 - /incubator/jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/server/AbstractWebdavServlet.java
Date Mon, 13 Mar 2006 11:01:08 GMT
Author: angela
Date: Mon Mar 13 03:01:01 2006
New Revision: 385506

URL: http://svn.apache.org/viewcvs?rev=385506&view=rev
Log:
fixing indention,
change invalid @todo tag to simple comment

Modified:
    incubator/jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/server/AbstractWebdavServlet.java

Modified: incubator/jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/server/AbstractWebdavServlet.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/server/AbstractWebdavServlet.java?rev=385506&r1=385505&r2=385506&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/server/AbstractWebdavServlet.java
(original)
+++ incubator/jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/server/AbstractWebdavServlet.java
Mon Mar 13 03:01:01 2006
@@ -80,10 +80,10 @@
 /**
  * <code>AbstractWebdavServlet</code>
  * <p/>
- * todo respect Position header
  */
 abstract public class AbstractWebdavServlet extends HttpServlet implements DavConstants {
 
+    // todo respect Position header
     /**
      * default logger
      */
@@ -380,15 +380,15 @@
 
         long modSince = request.getDateHeader("If-Modified-Since");
         if (modSince > IOUtil.UNDEFINED_TIME) {
-        long modTime = resource.getModificationTime();
+            long modTime = resource.getModificationTime();
             // test if resource has been modified. note that formatted modification
             // time lost the milli-second precision
             if (modTime != IOUtil.UNDEFINED_TIME && (modTime / 1000 * 1000) <=
modSince) {
-            // resource has not been modified since the time indicated in the
-            // 'If-Modified-Since' header.
-            response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
-            return;
-        }
+                // resource has not been modified since the time indicated in the
+                // 'If-Modified-Since' header.
+                response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+                return;
+            }
         }
 
         // spool resource properties and ev. resource content.
@@ -1022,14 +1022,14 @@
             response.sendError(DavServletResponse.SC_METHOD_NOT_ALLOWED);
             return;
         }
-            Document doc = request.getRequestDocument();
-            if (doc != null) {
-                SearchInfo sR = SearchInfo.createFromXml(doc.getDocumentElement());
-                response.sendMultiStatus(((SearchResource) resource).search(sR));
-            } else {
-                // request without request body is valid if requested resource
-                // is a 'query' resource.
-                response.sendMultiStatus(((SearchResource) resource).search(null));
+        Document doc = request.getRequestDocument();
+        if (doc != null) {
+            SearchInfo sR = SearchInfo.createFromXml(doc.getDocumentElement());
+            response.sendMultiStatus(((SearchResource) resource).search(sR));
+        } else {
+            // request without request body is valid if requested resource
+            // is a 'query' resource.
+            response.sendMultiStatus(((SearchResource) resource).search(null));
         }
     }
 



Mime
View raw message