From 8dd910c9acc446dc2560ab66e80f7f8c67347577 Mon Sep 17 00:00:00 2001
From: "Andreas L. Delmelle" <adelmelle@apache.org>
Date: Sun, 6 Feb 2011 01:15:39 +0000
Subject: [PATCH] Restored part that would otherwise cause a
 StackOverflowError...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1067565 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
index fdb0e5347..bfcc44b3c 100644
--- a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
@@ -268,7 +268,9 @@ public class BlockLayoutManager extends BlockStackingLayoutManager
                 innerPosition = pos.getPosition();
             }
 
-            if (innerPosition != null) {
+            if (innerPosition != null
+                    && (innerPosition.getLM() != this
+                        || innerPosition instanceof MappingPosition)) {
                 // innerPosition was created by another LM
                 positionList.add(innerPosition);
                 lastLM = innerPosition.getLM();
-- 
2.39.5