Author: antonio
Date: Sun Oct 31 14:31:36 2004
New Revision: 56164
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/transformation/BetwixtTransformer.java
cocoon/branches/BRANCH_2_1_X/status.xml
Log:
Backporting from 2.2: Fixing BetwixtTransformer does not marshal Collections
properly (java.lang.OutOfMemoryError).
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/transformation/BetwixtTransformer.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/transformation/BetwixtTransformer.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/transformation/BetwixtTransformer.java
Sun Oct 31 14:31:36 2004
@@ -216,15 +216,14 @@
beanWriter.getBindingConfiguration().setMapIDs(this.refIds);
}
-
if (bean instanceof Collection) {
- Iterator i = ((Collection) bean).iterator();
- while (i.hasNext()) {
- if (element == null) {
- beanWriter.write(bean);
- } else {
- beanWriter.write(element, bean);
- }
+ for (Iterator i = ((Collection) bean).iterator();
i.hasNext();) {
+ Object o = i.next();
+ if (element == null) {
+ beanWriter.write(o);
+ } else {
+ beanWriter.write(element, o);
+ }
}
} else {
if (element == null) {
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Sun Oct 31 14:31:36 2004
@@ -416,6 +416,9 @@
Mail block: The mail transformer ignored configured toAddresses from a
pipeline parameter. This is fixed now.
</action>
+ <action dev="AG" type="fix" fixes-bug="28209" due-to="Enrico Maccias"
due-to-email="[EMAIL PROTECTED]">
+ Fixing BetwixtTransformer does not marshal Collections properly
(java.lang.OutOfMemoryError).
+ </action>
<action dev="AG" type="update">
Update qdox to 1.5 and jdt-core to 3.0.0.
</action>
