Author: adelmelle
Date: Sun Feb  6 01:15:39 2011
New Revision: 1067565

URL: http://svn.apache.org/viewvc?rev=1067565&view=rev
Log:
Restored part that would otherwise cause a StackOverflowError...

Modified:
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java?rev=1067565&r1=1067564&r2=1067565&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java 
Sun Feb  6 01:15:39 2011
@@ -268,7 +268,9 @@ public class BlockLayoutManager extends 
                 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();



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to