瀏覽代碼

gets around a possible npe


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194473 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-0_20_3
Keiron Liddle 23 年之前
父節點
當前提交
961717f219
共有 2 個檔案被更改,包括 8 行新增4 行删除
  1. 5
    2
      src/org/apache/fop/fo/FONode.java
  2. 3
    2
      src/org/apache/fop/fo/flow/Marker.java

+ 5
- 2
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() {

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


Loading…
取消
儲存