Fix for NPE

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

diff --git a/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java b/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java
index 9c330f6abfe2e7a81eaf144ad7cc74d1a06d4ffa..98d7fd5bccca989ec621c9b986a48cfbb8db1f47 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java
+++ b/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java
@@ -104,6 +104,7 @@ public class CollapsingBorderModelEyeCatching extends CollapsingBorderModel {
             current[2] = currentBody.getCommonBorderPaddingBackground().getBorderInfo(side);
         }
         if (otherGridUnit != null
+                && otherBody != null
                 && ((otherSide == BEFORE && otherGridUnit.getFlag(GridUnit.FIRST_IN_BODY))
                     || (otherSide == AFTER && otherGridUnit.getFlag(GridUnit.LAST_IN_BODY)))) {
             //row group (=body, table-header or table-footer)