pnever      2002/06/21 04:19:10

  Modified:    src/webdav/server/org/apache/slide/webdav/util
                        UriHandler.java
  Log:
  Fixed bug in isResourceInWorkspaceUri() and removed obsolete constructor
  
  Revision  Changes    Path
  1.18      +11 -10    
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java
  
  Index: UriHandler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- UriHandler.java   20 Jun 2002 11:31:36 -0000      1.17
  +++ UriHandler.java   21 Jun 2002 11:19:10 -0000      1.18
  @@ -320,8 +320,11 @@
       /**
        * Protected constructor
        */
  -    protected UriHandler( String[] uriTokens ) {
  -        this.uriTokens = uriTokens;
  +    protected UriHandler( String[] uriTokens, int number ) {
  +        String[] t = new String[number];
  +        for( int i = 0; i < number; i++ )
  +            t[i] = uriTokens[i];
  +        this.uriTokens = t;
       }
       
       /**
  @@ -350,10 +353,7 @@
       public UriHandler getParentUriHandler() {
           if( uriTokens.length == 0 )
               return null;
  -        String[] puhtoks = new String[uriTokens.length - 1];
  -        for( int i = 0; i < puhtoks.length; i++ )
  -            puhtoks[i] = uriTokens[i];
  -        return new UriHandler( puhtoks );
  +        return new UriHandler( uriTokens, uriTokens.length - 1 );
       }
       
       /**
  @@ -448,7 +448,8 @@
           String[] wspathTokens = wspathHandler.getUriTokens();
           
           if( (wspathTokens.length + 1) < uriTokens.length ) {
  -            if( wspathHandler.isWorkspacePathUri(getParentUriHandler()) ) {
  +            UriHandler p = new UriHandler( uriTokens, wspathTokens.length + 1 );
  +            if( p.isWorkspaceUri() ) {
               return true;
           }
           }
  
  
  

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

Reply via email to