cvs commit: cocoon-2.1/src/java/org/apache/cocoon/environment/internal EnvironmentHelper.java

[cziegeler]

cziegeler    2004/05/29 10:39:38

  Modified:    src/java/org/apache/cocoon/environment
                        AbstractEnvironment.java
               src/java/org/apache/cocoon/environment/internal
                        EnvironmentHelper.java
  Log:
  Fix two problems in the env handling spotted by Bruno and Toni
  
  Revision  Changes    Path
  1.23      +2 -2      
cocoon-2.1/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
  
  Index: AbstractEnvironment.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/AbstractEnvironment.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- AbstractEnvironment.java  25 May 2004 07:28:24 -0000      1.22
  +++ AbstractEnvironment.java  29 May 2004 17:39:38 -0000      1.23
  @@ -42,7 +42,7 @@
       protected String uri;
   
       /** The prefix */
  -    protected String prefix;
  +    protected String prefix = "";
       
       /** The View requested */
       protected String view;
  
  
  
  1.3       +3 -1      
cocoon-2.1/src/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java
  
  Index: EnvironmentHelper.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EnvironmentHelper.java    26 May 2004 01:31:06 -0000      1.2
  +++ EnvironmentHelper.java    29 May 2004 17:39:38 -0000      1.3
  @@ -201,6 +201,8 @@
                   this.lastPrefix = this.lastPrefix + '/';
               }
               this.prefix = buffer.toString();
  +        } else {
  +            this.lastPrefix = null;
           }
   
           if (SourceUtil.getScheme(this.context).equals("zip")) {