klease 01/11/09 15:03:54
Modified: src/org/apache/fop/layoutmgr AbstractLayoutManager.java
PageLayoutManager.java
Log:
Fix a couple of NPE
Revision Changes Path
1.2 +2 -2 xml-fop/src/org/apache/fop/layoutmgr/AbstractLayoutManager.java
Index: AbstractLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/AbstractLayoutManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractLayoutManager.java 2001/11/09 21:57:47 1.1
+++ AbstractLayoutManager.java 2001/11/09 23:03:54 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: AbstractLayoutManager.java,v 1.1 2001/11/09 21:57:47 klease Exp $
+ * $Id: AbstractLayoutManager.java,v 1.2 2001/11/09 23:03:54 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -39,8 +39,8 @@
Iterator children = fobj.getChildren();
while (children.hasNext()) {
LayoutManager lm = ((FObj)children.next()).getLayoutManager();
- lm.setParentLM(this);
if (lm != null) {
+ lm.setParentLM(this);
lm.generateAreas();
}
}
1.2 +2 -1 xml-fop/src/org/apache/fop/layoutmgr/PageLayoutManager.java
Index: PageLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/PageLayoutManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PageLayoutManager.java 2001/11/09 21:57:47 1.1
+++ PageLayoutManager.java 2001/11/09 23:03:54 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: PageLayoutManager.java,v 1.1 2001/11/09 21:57:47 klease Exp $
+ * $Id: PageLayoutManager.java,v 1.2 2001/11/09 23:03:54 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -72,6 +72,7 @@
* For now, only handle normal flow areas.
*/
public void addChild(Area childArea) {
+ if (childArea ==null) return;
if (childArea.getAreaClass() == Area.CLASS_NORMAL) {
placeFlowRefArea(childArea);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
