diff options
| author | Vincent Hennebert <vhennebert@apache.org> | 2012-01-31 14:56:55 +0000 |
|---|---|---|
| committer | Vincent Hennebert <vhennebert@apache.org> | 2012-01-31 14:56:55 +0000 |
| commit | 49c7697650720db1bd8afa88046b6cecd7206f00 (patch) | |
| tree | 6e5bd63a6b3566c72b2f71eaf74f4492e989e541 /src/java/org/apache | |
| parent | af35f0470875116ed42e407c05127f16272ec890 (diff) | |
| download | xmlgraphics-fop-49c7697650720db1bd8afa88046b6cecd7206f00.tar.gz xmlgraphics-fop-49c7697650720db1bd8afa88046b6cecd7206f00.zip | |
master is not supposed to still be null when canProcess is called
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1238642 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache')
| -rw-r--r-- | src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java | 8 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java index 63af7e5c0..710bb4f17 100644 --- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java +++ b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java @@ -172,12 +172,8 @@ public class RepeatablePageMasterReference extends FObj /** {@inheritDoc} */ public boolean canProcess(String flowName) { - if (master != null) { - return master.getRegion(FO_REGION_BODY).getRegionName().equals(flowName); - } - else { - return false; - } + assert master != null; + return master.getRegion(FO_REGION_BODY).getRegionName().equals(flowName); } /** {@inheritDoc} */ diff --git a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java index 2fa664336..99fc5b216 100644 --- a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java +++ b/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java @@ -150,12 +150,8 @@ public class SinglePageMasterReference extends FObj /** {@inheritDoc} */ public boolean canProcess(String flowName) { - if (master != null) { - return master.getRegion(FO_REGION_BODY).getRegionName().equals(flowName); - } - else { - return false; - } + assert master != null; + return master.getRegion(FO_REGION_BODY).getRegionName().equals(flowName); } /** {@inheritDoc} */ |