Bugzilla 42703:

Fixed a regression introduced by the fix for Bugzilla 44286


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@652835 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 3 deletions

diff --git a/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java b/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
index bfebf6233..557a1778e 100644
--- a/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
+++ b/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java
@@ -116,6 +116,7 @@ public class XMLWhiteSpaceHandler {
             
             if (ancestor.getNameId() == Constants.FO_BLOCK) {
                 currentBlock = (Block) ancestor;
+                nestedBlockStack.push(currentBlock);
             }
         } else if (!nestedBlockStack.isEmpty()) {
             currentBlock = (Block) nestedBlockStack.peek();
@@ -206,9 +207,7 @@ public class XMLWhiteSpaceHandler {
                 /* end of block: clear the references and pop the 
                  * nested block stack */
                 if (!nestedBlockStack.empty()) {
-                    currentBlock = (Block) nestedBlockStack.pop();
-                } else {
-                    currentBlock = null;
+                    nestedBlockStack.pop();
                 }
                 charIter = null;
             }