haul 2002/08/09 01:40:31
Modified: src/java/org/apache/cocoon/components/treeprocessor
TreeProcessor.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
CallFunctionNode.java ContinueNode.java
Log:
Moved setting component manager down to leave, otherwise it could be an ancestor
manager.
Revision Changes Path
1.21 +1 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Index: TreeProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TreeProcessor.java 31 Jul 2002 13:13:26 -0000 1.20
+++ TreeProcessor.java 9 Aug 2002 08:40:31 -0000 1.21
@@ -323,7 +323,6 @@
// and now process
CocoonComponentManager.enterEnvironment(environment,
environment.getObjectModel(), this);
- environment.setComponentManager(this.manager);
try {
return this.rootNode.invoke(environment, context);
} finally {
1.3 +1 -0
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallFunctionNode.java
Index: CallFunctionNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/CallFunctionNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CallFunctionNode.java 24 Jun 2002 20:32:19 -0000 1.2
+++ CallFunctionNode.java 9 Aug 2002 08:40:31 -0000 1.3
@@ -137,6 +137,7 @@
// Obtain the redirector
Redirector redirector = PipelinesNode.getRedirector(env);
+ env.setComponentManager(this.manager);
try {
interpreter.callFunction(name, params, env /*, redirector*/);
}
1.3 +1 -0
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ContinueNode.java
Index: ContinueNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ContinueNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContinueNode.java 24 Jun 2002 20:32:19 -0000 1.2
+++ ContinueNode.java 9 Aug 2002 08:40:31 -0000 1.3
@@ -96,6 +96,7 @@
// Obtain the redirector
Redirector redirector = PipelinesNode.getRedirector(env);
+ env.setComponentManager(this.manager);
try {
interpreter.handleContinuation(contId, params, env /*, redirector*/);
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
