aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
diff options
context:
space:
mode:
authorLuis Bernardo <lbernardo@apache.org>2014-12-02 00:29:57 +0000
committerLuis Bernardo <lbernardo@apache.org>2014-12-02 00:29:57 +0000
commit16741be59821d79308d670ff7b61ec72702595e1 (patch)
tree7b5aa84fbb351a93105c3ca8d4fc939807674159 /src/java/org/apache/fop/layoutmgr/SpaceResolver.java
parent97e5ccb03a3990c94324bde7fa617a77566e1e62 (diff)
downloadxmlgraphics-fop-16741be59821d79308d670ff7b61ec72702595e1.tar.gz
xmlgraphics-fop-16741be59821d79308d670ff7b61ec72702595e1.zip
Merged branches/Temp_BasicSideFloat back to trunk.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1642793 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/layoutmgr/SpaceResolver.java')
-rw-r--r--src/java/org/apache/fop/layoutmgr/SpaceResolver.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/SpaceResolver.java b/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
index 31bdaebbf..551e7d3f2 100644
--- a/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
+++ b/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
@@ -696,7 +696,7 @@ public final class SpaceResolver {
beforeBreak.notifyBreakSituation(true, RelSide.BEFORE);
}
}
- el = (KnuthElement)effectiveList.get(endElementIndex);
+ el = endElementIndex > -1 ? (KnuthElement) effectiveList.get(endElementIndex) : null;
if (el != null && el.isPenalty()) {
Position pos = el.getPosition();
if (pos instanceof SpaceResolver.SpaceHandlingBreakPosition) {