Author: cziegeler
Date: Mon Jan 31 10:28:25 2005
New Revision: 149279
URL: http://svn.apache.org/viewcvs?view=rev&rev=149279
Log:
Fix NPE with sitemap component configurations
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java?view=diff&r1=149278&r2=149279
==============================================================================
---
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java
Mon Jan 31 10:28:25 2005
@@ -96,16 +96,18 @@
return
this.wrappingProcessor.parent.getComponentConfigurations();
}
return null;
- } else {
- if (this.wrappingProcessor.parent == null) {
- return new Configuration[]{this.componentConfigurations};
- }
- final Configuration[] parentArray =
this.wrappingProcessor.parent.getComponentConfigurations();
+ }
+ if (this.wrappingProcessor.parent == null) {
+ return new Configuration[]{this.componentConfigurations};
+ }
+ final Configuration[] parentArray =
this.wrappingProcessor.parent.getComponentConfigurations();
+ if ( parentArray != null ) {
final Configuration[] newArray = new
Configuration[parentArray.length + 1];
System.arraycopy(parentArray, 0, newArray, 1, parentArray.length);
newArray[0] = this.componentConfigurations;
return newArray;
- }
+ }
+ return new Configuration[] {this.componentConfigurations};
}
/**
