From: Keiron Liddle <keiron@apache.org>
Date: Fri, 21 Sep 2001 09:08:38 +0000 (+0000)
Subject: gets around a possible npe
X-Git-Tag: fop-0_20_3~45
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=961717f2193dfb190b43d63594704a4994f14d22;p=xmlgraphics-fop.git

gets around a possible npe


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

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
+            //                     + "'");
         }
     }