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/08/02 17:08:12 UTC
svn commit: r428017 -
/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/DefaultSitemapConfigurationHolder.java
Author: cziegeler
Date: Wed Aug 2 08:08:11 2006
New Revision: 428017
URL: http://svn.apache.org/viewvc?rev=428017&view=rev
Log:
Prevent NPE
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/DefaultSitemapConfigurationHolder.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/DefaultSitemapConfigurationHolder.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/DefaultSitemapConfigurationHolder.java?rev=428017&r1=428016&r2=428017&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/DefaultSitemapConfigurationHolder.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/DefaultSitemapConfigurationHolder.java Wed Aug 2 08:08:11 2006
@@ -18,6 +18,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.cocoon.Processor;
+
/**
*
* @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
@@ -42,7 +44,11 @@
* @see SitemapConfigurationHolder#getConfiguration()
*/
public ChainedConfiguration getConfiguration() {
- Map confs = CocoonComponentManager.getCurrentProcessor().getComponentConfigurations();
+ final Processor processor = CocoonComponentManager.getCurrentProcessor();
+ if ( processor == null ) {
+ return null;
+ }
+ Map confs = processor.getComponentConfigurations();
return (ChainedConfiguration) (confs == null ? null : confs.get(this.role));
}