sylvain 2004/01/21 04:39:21
Modified: src/java/org/apache/cocoon/components/treeprocessor
TreeProcessor.java
Log:
Fix wrong key used to store the SourceResolver in the object model (reported
by Antonio)
Revision Changes Path
1.19 +3 -5
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Index: TreeProcessor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TreeProcessor.java 19 Jan 2004 04:37:37 -0000 1.18
+++ TreeProcessor.java 21 Jan 2004 12:39:21 -0000 1.19
@@ -111,8 +111,6 @@
public static final String REDIRECTOR_ATTR = "sitemap:redirector";
public static final String COCOON_REDIRECT_ATTR =
"sitemap:cocoon-redirect";
- private static final String OBJECT_SOURCE_RESOLVER =
"sitemap:sourceresolver";
-
private static final String XCONF_URL =
"resource://org/apache/cocoon/components/treeprocessor/treeprocessor-builtins.xml";
@@ -360,14 +358,14 @@
Map objectModel = environment.getObjectModel();
- Object oldResolver = objectModel.get(OBJECT_SOURCE_RESOLVER);
+ Object oldResolver =
objectModel.get(ProcessingNode.OBJECT_SOURCE_RESOLVER);
Object oldRedirector = environment.getAttribute(REDIRECTOR_ATTR);
// Build a redirector
TreeProcessorRedirector redirector = new
TreeProcessorRedirector(environment, context);
setupLogger(redirector);
- objectModel.put(OBJECT_SOURCE_RESOLVER, environment);
+ objectModel.put(ProcessingNode.OBJECT_SOURCE_RESOLVER, environment);
environment.setAttribute(REDIRECTOR_ATTR, redirector);
try {
boolean success = this.rootNode.invoke(environment, context);
