crafterm 2002/09/13 10:47:54
Modified: src/java/org/apache/cocoon/components/treeprocessor/sitemap
GenerateNode.java SerializeNode.java
TransformNode.java
Log:
Applied pipeline-hint optimization patch.
PR: #12443
Submitted by: Michael Melhem ([EMAIL PROTECTED])
Reviewed by: Sylvain Wallez ([EMAIL PROTECTED])
Revision Changes Path
1.8 +6 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNode.java
Index: GenerateNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GenerateNode.java 9 Sep 2002 12:00:42 -0000 1.7
+++ GenerateNode.java 13 Sep 2002 17:47:54 -0000 1.8
@@ -60,6 +60,8 @@
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
+import org.apache.avalon.framework.parameters.Parameters;
+
import java.util.*;
/**
@@ -100,7 +102,9 @@
this.generatorName,
source.resolve(mapStack, objectModel),
VariableResolver.buildParameters(this.parameters, mapStack,
objectModel),
- VariableResolver.buildParameters(this.pipelineHints, mapStack,
objectModel)
+ this.pipelineHints == null
+ ? Parameters.EMPTY_PARAMETERS
+ : VariableResolver.buildParameters(this.pipelineHints,
mapStack, objectModel)
);
1.7 +4 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java
Index: SerializeNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SerializeNode.java 9 Sep 2002 12:00:42 -0000 1.6
+++ SerializeNode.java 13 Sep 2002 17:47:54 -0000 1.7
@@ -133,7 +133,9 @@
this.serializerName,
null,
Parameters.EMPTY_PARAMETERS, // No parameters on serializers
- VariableResolver.buildParameters(this.pipelineHints, mapStack,
objectModel),
+ this.pipelineHints == null
+ ? Parameters.EMPTY_PARAMETERS
+ : VariableResolver.buildParameters(this.pipelineHints,
mapStack, objectModel),
this.mimeType
);
1.7 +6 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNode.java
Index: TransformNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TransformNode.java 9 Sep 2002 12:00:42 -0000 1.6
+++ TransformNode.java 13 Sep 2002 17:47:54 -0000 1.7
@@ -59,6 +59,8 @@
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
+import org.apache.avalon.framework.parameters.Parameters;
+
import java.util.List;
import java.util.Map;
@@ -97,7 +99,9 @@
this.transformerName,
source.resolve(mapStack, objectModel),
VariableResolver.buildParameters(this.parameters, mapStack,
objectModel),
- VariableResolver.buildParameters(this.pipelineHints, mapStack,
objectModel)
+ this.pipelineHints == null
+ ? Parameters.EMPTY_PARAMETERS
+ : VariableResolver.buildParameters(this.pipelineHints,
mapStack, objectModel)
);
// Check view
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
