vgritsenko 01/08/14 09:02:05
Modified: src/org/apache/cocoon/sitemap Handler.java
Log:
Restore environment state after processing
Revision Changes Path
1.16 +7 -4 xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java
Index: Handler.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Handler.java 2001/07/07 11:43:34 1.15
+++ Handler.java 2001/08/14 16:02:05 1.16
@@ -40,7 +40,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.15 $ $Date: 2001/07/07 11:43:34 $
+ * @version CVS $Revision: 1.16 $ $Date: 2001/08/14 16:02:05 $
*/
public class Handler extends AbstractLoggable
implements Runnable, Contextualizable, Composable, Processor, Disposable,
SourceResolver {
@@ -114,12 +114,13 @@
if (this.sourceFileName.charAt(this.sourceFileName.length() - 1) == '/') {
this.sourceFileName = this.sourceFileName + "sitemap.xmap";
}
+ SourceHandler oldSourceHandler = environment.getSourceHandler();
try {
environment.setSourceHandler(this.sourceHandler);
this.source = environment.resolve(this.sourceFileName);
this.contextSource = environment.resolve("");
} finally {
- environment.setSourceHandler(null);
+ environment.setSourceHandler(oldSourceHandler);
}
if (!this.isRegenerationRunning) {
isRegenerationRunning = true;
@@ -155,22 +156,24 @@
public boolean process(Environment environment) throws Exception {
checkSanity();
+ SourceHandler oldSourceHandler = environment.getSourceHandler();
try {
environment.setSourceHandler(this.sourceHandler);
return sitemap.process(environment);
} finally {
- environment.setSourceHandler(null);
+ environment.setSourceHandler(oldSourceHandler);
}
}
public boolean process(Environment environment, StreamPipeline pipeline,
EventPipeline eventPipeline) throws Exception {
checkSanity();
+ SourceHandler oldSourceHandler = environment.getSourceHandler();
try {
environment.setSourceHandler(this.sourceHandler);
return sitemap.process(environment, pipeline, eventPipeline);
} finally {
- environment.setSourceHandler(null);
+ environment.setSourceHandler(oldSourceHandler);
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
