cvs commit: jahia/src/java/org/apache/slide/webdav/method WebdavMethod.java jahia/src/java/org/apache/slide/webdav JahiaWebdavServlet.java

[Thomas Draier]

tdraier     2005/03/03 17:36:44 CET

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    src/java/org/apache/slide/webdav/method WebdavMethod.java 
    src/java/org/apache/slide/webdav JahiaWebdavServlet.java 
  Log:
  fixed office/slide issue when accessing a private file
  
  Revision     Changes    Path
  1.6.4.1.2.1  +3 -1      
jahia/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java.diff?r1=1.6.4.1&r2=1.6.4.1.2.1&f=h
  1.3.6.1      +6 -3      
jahia/src/java/org/apache/slide/webdav/method/WebdavMethod.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/apache/slide/webdav/method/WebdavMethod.java.diff?r1=1.3&r2=1.3.6.1&f=h
  
  
  
  Index: WebdavMethod.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/apache/slide/webdav/method/Attic/WebdavMethod.java,v
  retrieving revision 1.3
  retrieving revision 1.3.6.1
  diff -u -r1.3 -r1.3.6.1
  --- WebdavMethod.java 12 Dec 2003 11:38:11 -0000      1.3
  +++ WebdavMethod.java 3 Mar 2005 16:36:44 -0000       1.3.6.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/repository/jahia/src/java/org/apache/slide/webdav/method/Attic/WebdavMethod.java,v
 1.3 2003/12/12 11:38:11 knguyen Exp $
  - * $Revision: 1.3 $
  - * $Date: 2003/12/12 11:38:11 $
  + * $Header: 
/home/cvs/repository/jahia/src/java/org/apache/slide/webdav/method/Attic/WebdavMethod.java,v
 1.3.6.1 2005/03/03 16:36:44 tdraier Exp $
  + * $Revision: 1.3.6.1 $
  + * $Date: 2005/03/03 16:36:44 $
    *
    * ====================================================================
    *
  @@ -308,6 +308,9 @@
               requestUri = structure.retrieve(slideToken, requestUri).getUri();
           } catch (ObjectNotFoundException ex) {
               requestUri = ex.getObjectUri();
  +        } catch (AccessDeniedException ex) {
  +            resp.setStatus(WebdavStatus.SC_UNAUTHORIZED);
  +            throw new WebdavException(WebdavStatus.SC_UNAUTHORIZED);
           } catch (SlideException ex) {
               token.getLogger().log(ex,LOG_CHANNEL,Logger.ERROR);
               resp.setStatus(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
  
  
  
  Index: JahiaWebdavServlet.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/apache/slide/webdav/Attic/JahiaWebdavServlet.java,v
  retrieving revision 1.6.4.1
  retrieving revision 1.6.4.1.2.1
  diff -u -r1.6.4.1 -r1.6.4.1.2.1
  --- JahiaWebdavServlet.java   3 Aug 2004 13:26:06 -0000       1.6.4.1
  +++ JahiaWebdavServlet.java   3 Mar 2005 16:36:44 -0000       1.6.4.1.2.1
  @@ -259,7 +259,9 @@
   
           } catch (WebdavException e) {
               // There has been an error somewhere ...
  -            resp.sendError(e.getStatusCode());
  +            if (!resp.isCommitted()) {
  +                resp.sendError(e.getStatusCode());
  +            }
               if (e.getStatusCode() == WebdavStatus.SC_UNAUTHORIZED) {
                   resp.addHeader("WWW-Authenticate", "BASIC realm=\"" + 
((NamespaceAccessToken) 
req.getAttribute(HttpRequestWrapper.TOKEN_ATTRIBUTE)).getName() + "\"");
               }