You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2007/12/02 01:01:55 UTC

svn commit: r600218 - in /cocoon/branches/BRANCH_2_1_X: src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java status.xml

Author: anathaniel
Date: Sat Dec  1 16:01:55 2007
New Revision: 600218

URL: http://svn.apache.org/viewvc?rev=600218&view=rev
Log:
Sitemap: Redirect to cocoon:/foo did not work in sub-sitemap when it is in same directory as the root sitemap.

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java?rev=600218&r1=600217&r2=600218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java Sat Dec  1 16:01:55 2007
@@ -286,7 +286,7 @@
 
         // Get the processor that should process this request
         ConcreteTreeProcessor processor;
-        if (newEnv.getRootContext().equals(newEnv.getContext())) {
+        if ( newEnv.getURIPrefix().equals("") ) {
             processor = ((TreeProcessor)getRootProcessor()).concreteProcessor;
         } else {
             processor = this;

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=600218&r1=600217&r2=600218&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Sat Dec  1 16:01:55 2007
@@ -182,6 +182,9 @@
 
   <changes>
   <release version="2.1.11" date="TBD">
+    <action dev="AN" type="fix" fixes-bug="COCOON-1990" due-to="Robert Hoffmann" due-to-email="roberth@mit.edu">
+      Sitemap: Redirect to cocoon:/foo did not work in sub-sitemap when it is in same directory as the root sitemap. 
+    </action>
     <action dev="AG" type="update">
       Core: Update xercesImpl to 2.9.1.
     </action>