aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2015-05-08 18:52:41 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2015-05-08 18:52:41 +0000
commite1a9121307f5795cd91e04bc82a226e5235b379e (patch)
treecd9cd0e69804c87d4c87893bb4a8854e5829e3f9 /src/java/org/apache
parent14f86f666166e530b3588fc606fe0346e37f5c20 (diff)
downloadxmlgraphics-fop-e1a9121307f5795cd91e04bc82a226e5235b379e.tar.gz
xmlgraphics-fop-e1a9121307f5795cd91e04bc82a226e5235b379e.zip
[Test commit rights] Move otherwise unreachable null check
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1678425 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache')
-rw-r--r--src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java3
-rw-r--r--src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
index 8830278b4..b687689bc 100644
--- a/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
@@ -63,6 +63,9 @@ public abstract class AbstractBaseLayoutManager
* @param fo the formatting object for this layout manager
*/
public AbstractBaseLayoutManager(FObj fo) {
+ if (fo == null) {
+ throw new IllegalStateException("Null formatting object found.");
+ }
this.fobj = fo;
setGeneratesReferenceArea(fo.generatesReferenceAreas());
}
diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index 5eac70548..3a73b233b 100644
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -82,9 +82,6 @@ public abstract class AbstractLayoutManager extends AbstractBaseLayoutManager im
*/
public AbstractLayoutManager(FObj fo) {
super(fo);
- if (fo == null) {
- throw new IllegalStateException("Null formatting object found.");
- }
markers = fo.getMarkers();
fobjIter = fo.getChildNodes();
childLMiter = new LMiter(this);