FOP-3181 Prevent page duplication when ipd changesHEADmain

1 files changed, 8 insertions, 0 deletions

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/RestartAtLM.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/RestartAtLM.java
index 4a0fcd885..647c9968f 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/RestartAtLM.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/RestartAtLM.java
@@ -100,10 +100,18 @@ class RestartAtLM {
                     position = position.getPosition();
                 }
                 if (position.getPosition() == null) {
+                    if (!breaker.getPageProvider().foUserAgent.isLegacyInvalidBreakPosition()) {
+                        breaker.firstElementsForRestart = new LinkedList<>();
+                        breaker.positionAtBreak = new LeafPosition(surroundingLM, positionIndex + 1);
+
+                        return surroundingLM;
+                    }
+
                     if (!position.getLM().getFObj().isForceKeepTogether()) {
                         position.getLM().getFObj().setForceKeepTogether(true);
                         invalidPosition = true;
                     }
+
                     return null;
                 }
                 restartAtLM = position.getPosition().getLM();