cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r638936 - /cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
Date Wed, 19 Mar 2008 17:04:08 GMT
Author: reinhard
Date: Wed Mar 19 10:04:02 2008
New Revision: 638936

URL: http://svn.apache.org/viewvc?rev=638936&view=rev
Log:
revert previous commit
this of course doesn't solve the original problem but doesn't alter expected behaviour

Modified:
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java?rev=638936&r1=638935&r2=638936&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
(original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
Wed Mar 19 10:04:02 2008
@@ -146,6 +146,9 @@
                 return false;
             }
 
+            throw new ResourceNotFoundException("No pipeline matched request: " +
+                            env.getURIPrefix() + env.getURI());
+
 
         } catch (ConnectionResetException e) {
             // Will be reported by CocoonServlet, rethrowing
@@ -155,9 +158,5 @@
             return this.errorHandlerHelper.invokeErrorHandler(e, env, context);
         }
 
-        // if nothing has matched and it is the last pipeline, then it's the right time
-        // to throw an ResourceNotFoundException
-        throw new ResourceNotFoundException("No pipeline matched request: " +
-                        env.getURIPrefix() + env.getURI());
     }
 }



Mime
View raw message