juergen     2003/09/08 05:34:53

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        AclMethod.java
  Log:
  marged (josef)
  
  Revision  Changes    Path
  1.32      +10 -4     
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AclMethod.java
  
  Index: AclMethod.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AclMethod.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- AclMethod.java    8 Sep 2003 12:11:29 -0000       1.31
  +++ AclMethod.java    8 Sep 2003 12:34:53 -0000       1.32
  @@ -448,7 +448,13 @@
               return "~";
           }
           else if (hasChild(principal, NamespaceCache.DEFAULT_NAMESPACE, 
E_UNAUTHENTICATED)) {
  -            return token.getNamespaceConfig().getUsersPath() + "/" +
  +                     String userCollection = "/";
  +                     String configParam = 
token.getNamespaceConfig().getParameter(AclConstants.P_USER_COLLECTION);
  +             if ( configParam != null ) {
  +             if ( configParam.length() > 0 )
  +                userCollection =  userCollection + configParam +"/";
  +             }
  +            return token.getNamespaceConfig().getUsersPath() + userCollection +
                   token.getNamespaceConfig().getGuestPath();
           }
           throw new JDOMException("<"+principal.getName()+"> element must 
contain either a "+
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to