You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2002/05/15 14:06:32 UTC

cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method AbstractMultistatusResponseMethod.java

juergen     02/05/15 05:06:32

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        AbstractMultistatusResponseMethod.java
  Log:
  Fixed bug in method generate207Response().
  (ralf)
  
  Revision  Changes    Path
  1.22      +14 -5     jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java
  
  Index: AbstractMultistatusResponseMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- AbstractMultistatusResponseMethod.java	15 May 2002 11:44:37 -0000	1.21
  +++ AbstractMultistatusResponseMethod.java	15 May 2002 12:06:32 -0000	1.22
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v 1.21 2002/05/15 11:44:37 juergen Exp $
  - * $Revision: 1.21 $
  - * $Date: 2002/05/15 11:44:37 $
  + * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v 1.22 2002/05/15 12:06:32 juergen Exp $
  + * $Revision: 1.22 $
  + * $Date: 2002/05/15 12:06:32 $
    *
    * ====================================================================
    *
  @@ -328,9 +328,18 @@
        */
   
       protected boolean generate207Response(boolean isCollection, NestedSlideException causeException, String resourceURI) {
  +        
  +        boolean is207 = false;
  +        if (isCollection) {
  +            if (causeException.getExceptionsCount() > 1) {
  +                is207 = true;
  +            }
  +            else if (causeException.getExceptionsCount() == 1) {
           SlideException unpackedException = causeException.unpackSingleException();
  -        if(!(isCollection && unpackedException != null)) return false;
  -        return !getURI(unpackedException).equals(resourceURI);
  +                is207 =  ! resourceURI.equals(getURI(unpackedException));
  +            }
  +        }
  +        return is207;
       }
       
       // -------------------------------------------------------- Private Methods
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>