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/07 23:43:53 UTC

svn commit: r602257 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java

Author: anathaniel
Date: Fri Dec  7 14:43:53 2007
New Revision: 602257

URL: http://svn.apache.org/viewvc?rev=602257&view=rev
Log:
Second attempt to fix COCOON-1990

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

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=602257&r1=602256&r2=602257&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 Fri Dec  7 14:43:53 2007
@@ -285,12 +285,10 @@
         }
 
         // Get the processor that should process this request
-        ConcreteTreeProcessor processor;
-        if ( newEnv.getURIPrefix().equals("") ) {
+        // (see https://issues.apache.org/jira/browse/COCOON-1990).
+        ConcreteTreeProcessor processor = this;
+        if (uri.startsWith("cocoon://"))
             processor = ((TreeProcessor)getRootProcessor()).concreteProcessor;
-        } else {
-            processor = this;
-        }
 
         // Process the redirect
         // No more reset since with TreeProcessorRedirector, we need to pop values from the redirect location