cziegeler 2003/01/14 04:08:18
Modified: src/java/org/apache/cocoon/components/source/impl
SitemapSource.java
Log:
Fixing source resolving bug
Revision Changes Path
1.36 +15 -3
xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- SitemapSource.java 14 Jan 2003 09:54:20 -0000 1.35
+++ SitemapSource.java 14 Jan 2003 12:08:18 -0000 1.36
@@ -335,11 +335,23 @@
this.processKey =
CocoonComponentManager.startProcessing(this.environment);
this.environment.setURI(this.prefix, this.uri);
this.processingPipeline =
this.processor.processInternal(this.environment);
- this.processingPipeline.prepareInternal(this.environment);
this.pipelineProcessor = this.environment.changeToLastContext();
+
String redirectURL = this.environment.getRedirectURL();
if (redirectURL == null) {
- this.sourceValidity =
this.processingPipeline.getValidityForEventPipeline();
+
+ EnvironmentStack envStack =
CocoonComponentManager.getCurrentEnvironmentStack();
+ int currentOffset = envStack.getOffset();
+ try {
+ CocoonComponentManager.enterEnvironment(this.environment,
+
this.environment.getObjectModel(),
+ this.pipelineProcessor);
+ this.processingPipeline.prepareInternal(this.environment);
+ this.sourceValidity =
this.processingPipeline.getValidityForEventPipeline();
+ } finally {
+ CocoonComponentManager.leaveEnvironment();
+ envStack.resetOffset(currentOffset);
+ }
} else {
if (redirectURL.indexOf(":") == -1) {
redirectURL = this.protocol + ":/" + redirectURL;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
