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/12/29 22:22:21 UTC
svn commit: r491107 -
/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
Author: cziegeler
Date: Fri Dec 29 13:22:20 2006
New Revision: 491107
URL: http://svn.apache.org/viewvc?view=rev&rev=491107
Log:
parent context cant be null
Modified:
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java?view=diff&rev=491107&r1=491106&r2=491107
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java Fri Dec 29 13:22:20 2006
@@ -170,9 +170,7 @@
final ChildXmlWebApplicationContext context = new ChildXmlWebApplicationContext(contextUrl,
definition);
context.setServletContext(servletContext);
- if ( parentContext != null ) {
- context.setParent(parentContext);
- }
+ context.setParent(parentContext);
if ( classloader != null ) {
context.setClassLoader(classloader);
}