vgritsenko 01/08/20 13:24:34
Modified: src/org/apache/cocoon Tag: cocoon_20_branch Cocoon.java
Log:
restore environment state
Revision Changes Path
No revision
No revision
1.9.2.13 +5 -3 xml-cocoon2/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.9.2.12
retrieving revision 1.9.2.13
diff -u -r1.9.2.12 -r1.9.2.13
--- Cocoon.java 2001/08/20 14:07:24 1.9.2.12
+++ Cocoon.java 2001/08/20 20:24:33 1.9.2.13
@@ -51,7 +51,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a> (Apache
Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.9.2.12 $ $Date: 2001/08/20 14:07:24 $
+ * @version CVS $Revision: 1.9.2.13 $ $Date: 2001/08/20 20:24:33 $
*/
public class Cocoon extends AbstractLoggable implements ThreadSafe, Component,
Initializable, Disposable, Modifiable, Processor, Contextualizable {
/** The application context */
@@ -434,6 +434,7 @@
public void generateSitemap(Environment environment)
throws Exception {
ProgramGenerator programGenerator = null;
+ SourceHandler oldSourceHandler = environment.getSourceHandler();
SourceHandler sourceHandler = null;
try {
programGenerator = (ProgramGenerator)
this.componentManager.lookup(ProgramGenerator.ROLE);
@@ -455,7 +456,7 @@
getLogger().error("Main: Error compiling sitemap", e);
throw e;
} finally {
- environment.setSourceHandler(null);
+ environment.setSourceHandler(oldSourceHandler);
if (programGenerator != null)
this.componentManager.release(programGenerator);
if (sourceHandler != null) this.componentManager.release((Component)
sourceHandler);
}
@@ -467,6 +468,7 @@
public void generateXSP(String fileName, Environment environment)
throws Exception {
ProgramGenerator programGenerator = null;
+ SourceHandler oldSourceHandler = environment.getSourceHandler();
SourceHandler sourceHandler = null;
try {
getLogger().debug("XSP generation begin:" + fileName);
@@ -485,7 +487,7 @@
getLogger().error("Main: Error compiling XSP", e);
throw e;
} finally {
- environment.setSourceHandler(null);
+ environment.setSourceHandler(oldSourceHandler);
if (programGenerator != null)
this.componentManager.release(programGenerator);
if (sourceHandler != null) this.componentManager.release((Component)
sourceHandler);
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
