You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@locus.apache.org on 2000/08/11 02:56:46 UTC
cvs commit: xml-fop/src/org/apache/fop/fo FObjMixed.java
keiron 00/08/10 17:56:46
Modified: src/org/apache/fop/fo FObjMixed.java
Log:
checks for null pointers, since this is used for unknown namespaces
then it may not be properly set up.
Revision Changes Path
1.9 +17 -10 xml-fop/src/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FObjMixed.java 2000/07/05 20:23:43 1.8
+++ FObjMixed.java 2000/08/11 00:56:46 1.9
@@ -1,4 +1,4 @@
-/*-- $Id: FObjMixed.java,v 1.8 2000/07/05 20:23:43 jordan Exp $ --
+/*-- $Id: FObjMixed.java,v 1.9 2000/08/11 00:56:46 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -81,15 +81,22 @@
public Status layout(Area area) throws FOPException {
- String id = this.properties.get("id").getString();
-
- if ( this.marker == START ) {
- area.getIDReferences().createID(id);
- this.marker = 0;
- }
-
- if ( this.marker == 0 ) {
- area.getIDReferences().configureID(id,area);
+ if(this.properties != null) {
+ Property prop = this.properties.get("id");
+ if(prop != null) {
+ String id = prop.getString();
+
+ if ( this.marker == START ) {
+ if(area.getIDReferences() != null)
+ area.getIDReferences().createID(id);
+ this.marker = 0;
+ }
+
+ if ( this.marker == 0 ) {
+ if(area.getIDReferences() != null)
+ area.getIDReferences().configureID(id,area);
+ }
+ }
}
int numChildren = this.children.size();