You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/03/18 19:30:45 UTC
svn commit: r386871 -
/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Author: cziegeler
Date: Sat Mar 18 10:30:40 2006
New Revision: 386871
URL: http://svn.apache.org/viewcvs?rev=386871&view=rev
Log:
Fix NPE
Modified:
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java?rev=386871&r1=386870&r2=386871&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java Sat Mar 18 10:30:40 2006
@@ -145,6 +145,7 @@
ContainerUtil.service(this.environmentHelper, this.manager);
this.environmentHelper.changeContext(sitemapSource, prefix);
this.sitemapExecutor = parent.sitemapExecutor;
+ this.beanFactory = parent.beanFactory;
}
/**
@@ -409,8 +410,14 @@
treeBuilder.setProcessor(newProcessor);
ProcessingNode root = treeBuilder.build(sitemapProgram);
+ ConfigurableListableBeanFactory factory = treeBuilder.getBeanFactory();
+ if ( factory == null ) {
+ factory = this.beanFactory;
+ } else {
+ this.beanFactory = factory;
+ }
newProcessor.setProcessorData(
- treeBuilder.getBeanFactory(),
+ factory,
treeBuilder.getServiceManager(),
root,
treeBuilder.getDisposableNodes(),