vgritsenko 01/08/20 14:47:30
Modified: src/org/apache/cocoon/environment Environment.java
AbstractEnvironment.java
src/org/apache/cocoon/sitemap Manager.java
Log:
QUICK FIX to make handle-errors work again.
Revision Changes Path
1.10 +3 -1 xml-cocoon2/src/org/apache/cocoon/environment/Environment.java
Index: Environment.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/Environment.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Environment.java 2001/08/20 13:55:13 1.9
+++ Environment.java 2001/08/20 21:47:30 1.10
@@ -20,7 +20,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.9 $ $Date: 2001/08/20 13:55:13 $
+ * @version CVS $Revision: 1.10 $ $Date: 2001/08/20 21:47:30 $
*/
public interface Environment extends SourceResolver {
@@ -49,6 +49,8 @@
* Get current context
*/
URL getContext();
+
+ void setContext(URL url);
/**
* Get the Root Context
1.17 +5 -2
xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AbstractEnvironment.java 2001/08/20 13:55:13 1.16
+++ AbstractEnvironment.java 2001/08/20 21:47:30 1.17
@@ -24,7 +24,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.16 $ $Date: 2001/08/20 13:55:13 $
+ * @version CVS $Revision: 1.17 $ $Date: 2001/08/20 21:47:30 $
*/
public abstract class AbstractEnvironment extends AbstractLoggable implements
Environment {
@@ -132,6 +132,10 @@
return this.context;
}
+ public void setContext(URL context) {
+ this.context = context;
+ }
+
/**
* Get the prefix of the URI in progress
*/
@@ -275,5 +279,4 @@
public void setResponseIsNotModified() {
// does nothing
}
-
}
1.11 +18 -4 xml-cocoon2/src/org/apache/cocoon/sitemap/Manager.java
Index: Manager.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Manager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Manager.java 2001/08/20 13:55:17 1.10
+++ Manager.java 2001/08/20 21:47:30 1.11
@@ -27,13 +27,14 @@
import java.util.HashMap;
import java.util.Iterator;
+import java.net.URL;
/**
* This class manages all sub <code>Sitemap</code>s of a <code>Sitemap</code>
* Invokation of sub sitemaps will be done by this instance as well
* checking regeneration of the sub <code>Sitemap</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.10 $ $Date: 2001/08/20 13:55:17 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/08/20 21:47:30 $
*/
public class Manager extends AbstractLoggable implements Component, Configurable,
Composable, Contextualizable, ThreadSafe {
private Context context;
@@ -99,7 +100,13 @@
Handler sitemapHandler = getHandler(newManager, environment, source,
check_reload, reload_asynchron);
// setup to invoke the processing
setupProcessing(environment, sitemapHandler, uri_prefix, source);
- return sitemapHandler.process(environment);
+ URL context = environment.getContext();
+ try{
+ environment.changeContext(uri_prefix, source);
+ return sitemapHandler.process(environment);
+ }finally{
+ environment.setContext(context);
+ }
}
/** invokes the sitemap handler to process a request
@@ -116,8 +123,15 @@
// get a sitemap handler
Handler sitemapHandler = getHandler(newManager, environment, source,
check_reload, reload_asynchron);
// setup to invoke the processing
+ environment.changeContext(uri_prefix, source);
setupProcessing(environment, sitemapHandler, uri_prefix, source);
- return sitemapHandler.process(environment, pipeline, eventPipeline);
+ URL context = environment.getContext();
+ try{
+ environment.changeContext(uri_prefix, source);
+ return sitemapHandler.process(environment, pipeline, eventPipeline);
+ }finally{
+ environment.setContext(context);
+ }
}
/** has the sitemap changed
@@ -191,7 +205,7 @@
private void setupProcessing(Environment environment, Handler sitemapHandler,
String uri_prefix,
String source) throws Exception {
- environment.changeContext(uri_prefix, source);
+// environment.changeContext(uri_prefix, source);
if (!sitemapHandler.available()) {
throw new ProcessingException("The sitemap handler's sitemap is not
available. " +
"Please check "+ logFilePath +" for the exact error.",
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
