cvs commit: jakarta-slide/src/share/org/apache/slide/common Uri.java

[remm]

remm        01/04/29 10:14:26

  Modified:    src/share/org/apache/slide/common Uri.java
  Log:
  - The result of getParentUri is allowed to be null.
  
  Revision  Changes    Path
  1.6       +6 -5      jakarta-slide/src/share/org/apache/slide/common/Uri.java
  
  Index: Uri.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Uri.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Uri.java  2001/04/28 03:43:34     1.5
  +++ Uri.java  2001/04/29 17:14:25     1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Uri.java,v 
1.5 2001/04/28 03:43:34 remm Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/04/28 03:43:34 $
  + * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Uri.java,v 
1.6 2001/04/29 17:14:25 remm Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/04/29 17:14:25 $
    *
    * ====================================================================
    *
  @@ -74,7 +74,7 @@
    * manipulated by Slide.
    * 
    * @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public final class Uri implements java.io.Serializable {
       
  @@ -237,7 +237,8 @@
        */
       public Uri getParentUri() {
           Uri result = scopes.getParentUri();
  -        result.setToken(token);
  +        if (result != null)
  +            result.setToken(token);
           return result;
       }