vgritsenko 02/04/13 20:42:51
Modified: src/java/org/apache/cocoon/components/language/generator
ProgramGeneratorImpl.java
Log:
Revert some changes: Create handler with supplied manager (reason: compiled sitemap
engine requires
newManager in order to have access to parent sitemap components)
Revision Changes Path
1.16 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ProgramGeneratorImpl.java 7 Apr 2002 18:48:12 -0000 1.15
+++ ProgramGeneratorImpl.java 14 Apr 2002 03:42:51 -0000 1.16
@@ -86,7 +86,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: ProgramGeneratorImpl.java,v 1.15 2002/04/07 18:48:12 sylvain
Exp $
+ * @version CVS $Id: ProgramGeneratorImpl.java,v 1.16 2002/04/14 03:42:51
vgritsenko Exp $
*/
public class ProgramGeneratorImpl extends AbstractLoggable
implements ProgramGenerator, Contextualizable, Composable, Parameterizable,
@@ -246,7 +246,7 @@
program = programmingLanguage.preload(normalizedName,
this.workDir, markupLanguage.getEncoding());
- this.cache.addGenerator(this.manager, normalizedName, program);
+ this.cache.addGenerator(newManager, normalizedName, program);
programInstance =
(CompiledComponent)this.cache.select(normalizedName);
} catch (Exception e) {
getLogger().debug("The program was not preloaded");
@@ -289,7 +289,7 @@
markupLanguage =
(MarkupLanguage)this.markupSelector.select(markupLanguageName);
}
- programInstance = this.createResource(this.manager,
+ programInstance = this.createResource(newManager,
source, normalizedName, markupLanguage,
programmingLanguage, resolver);
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
