diff options
| author | Andreas L. Delmelle <adelmelle@apache.org> | 2011-02-06 01:15:39 +0000 |
|---|---|---|
| committer | Andreas L. Delmelle <adelmelle@apache.org> | 2011-02-06 01:15:39 +0000 |
| commit | 8dd910c9acc446dc2560ab66e80f7f8c67347577 (patch) | |
| tree | 754334df3daf0fa463670b6d5cfd577e5ddd7436 | |
| parent | 70dcfa240017129c7a296ceb653fd2074d25ee64 (diff) | |
| download | xmlgraphics-fop-8dd910c9acc446dc2560ab66e80f7f8c67347577.tar.gz xmlgraphics-fop-8dd910c9acc446dc2560ab66e80f7f8c67347577.zip | |
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
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
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(); |