aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2008-08-29 20:12:34 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2008-08-29 20:12:34 +0000
commit9ff780f79dafdfbd0a25d2dbb7721bb049ae9663 (patch)
treeac70057c922d1f66fdd1494f00509e533f60afb0 /src
parent145f071b76a54c53b59d8905ff6f6b484f29dec0 (diff)
downloadxmlgraphics-fop-9ff780f79dafdfbd0a25d2dbb7721bb049ae9663.tar.gz
xmlgraphics-fop-9ff780f79dafdfbd0a25d2dbb7721bb049ae9663.zip
Bugzilla 45667: avoid NullPointerExceptions during hyphenation for empty inlines.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@690382 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
index a27fc6516..963b98b37 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
@@ -334,7 +334,8 @@ public abstract class InlineStackingLayoutManager extends AbstractLayoutManager
fromIndex = oldListIterator.previousIndex();
} else if (currLM == prevLM) {
bSomethingChanged
- = prevLM.applyChanges(oldList.subList(fromIndex, oldList.size()))
+ = (prevLM != null)
+ && prevLM.applyChanges(oldList.subList(fromIndex, oldList.size()))
|| bSomethingChanged;
} else {
bSomethingChanged