diff options
| author | Keiron Liddle <keiron@apache.org> | 2001-09-21 09:08:38 +0000 |
|---|---|---|
| committer | Keiron Liddle <keiron@apache.org> | 2001-09-21 09:08:38 +0000 |
| commit | 961717f2193dfb190b43d63594704a4994f14d22 (patch) | |
| tree | 5894f0ab1c8b031d08b77b842cd22c2098041e1c | |
| parent | 924dd8ccef0c291cb9d9234e7a43ff44f73309a7 (diff) | |
| download | xmlgraphics-fop-961717f2193dfb190b43d63594704a4994f14d22.tar.gz xmlgraphics-fop-961717f2193dfb190b43d63594704a4994f14d22.zip | |
gets around a possible npe
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194473 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/org/apache/fop/fo/FONode.java | 7 | ||||
| -rw-r--r-- | src/org/apache/fop/fo/flow/Marker.java | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/org/apache/fop/fo/FONode.java b/src/org/apache/fop/fo/FONode.java index a620eb235..af4791a40 100644 --- a/src/org/apache/fop/fo/FONode.java +++ b/src/org/apache/fop/fo/FONode.java @@ -234,11 +234,14 @@ abstract public class FONode { public void addMarker(Marker marker) throws FOPException { String mcname = marker.getMarkerClassName(); - if (!markers.containsKey(mcname) && children.isEmpty()) + if (!markers.containsKey(mcname) && children.isEmpty()) { markers.put(mcname, marker); - else + } else { + log.error("fo:marker must be an initial child," + + "and 'marker-class-name' must be unique for same parent"); throw new FOPException("fo:marker must be an initial child," + "and 'marker-class-name' must be unique for same parent"); + } } public boolean hasMarkers() { diff --git a/src/org/apache/fop/fo/flow/Marker.java b/src/org/apache/fop/fo/flow/Marker.java index 762ed8327..0eb0baaa5 100644 --- a/src/org/apache/fop/fo/flow/Marker.java +++ b/src/org/apache/fop/fo/flow/Marker.java @@ -45,8 +45,9 @@ public class Marker extends FObjMixed { try { parent.addMarker(this); } catch (FOPException fopex) { - log.error("marker cannot be added to '" + parent - + "'"); + // log is null in constructor + //log.error("marker cannot be added to '" + parent + // + "'"); } } |