aboutsummaryrefslogtreecommitdiffstats
path: root/src/java
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2008-05-02 17:28:25 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2008-05-02 17:28:25 +0000
commitcecacaf0e4c2d925347c829121422068c95ea376 (patch)
tree26f48e1ba75480f28d941c5ef7f15b4bc208a2e4 /src/java
parent8055bd932a423e3da1c8f68d36a4afaa15cec85a (diff)
downloadxmlgraphics-fop-cecacaf0e4c2d925347c829121422068c95ea376.tar.gz
xmlgraphics-fop-cecacaf0e4c2d925347c829121422068c95ea376.zip
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
Diffstat (limited to 'src/java')
-rw-r--r--src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java5
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;
}