sandygao 2004/12/07 10:11:27
Modified: java/src/org/apache/xerces/impl/xs XSAttributeDecl.java
XSAttributeUseImpl.java XSElementDecl.java
Log:
Potential NPEs.
Revision Changes Path
1.18 +10 -4
xml-xerces/java/src/org/apache/xerces/impl/xs/XSAttributeDecl.java
Index: XSAttributeDecl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/XSAttributeDecl.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XSAttributeDecl.java 6 Oct 2004 15:14:55 -0000 1.17
+++ XSAttributeDecl.java 7 Dec 2004 18:11:27 -0000 1.18
@@ -166,15 +166,21 @@
}
public Object getActualVC() {
- return fDefault.actualValue;
+ return getConstraintType() == XSConstants.VC_NONE ?
+ null :
+ fDefault.actualValue;
}
public short getActualVCType() {
- return fDefault.actualValueType;
+ return getConstraintType() == XSConstants.VC_NONE ?
+ XSConstants.UNAVAILABLE_DT :
+ fDefault.actualValueType;
}
public ShortList getItemValueTypes() {
- return fDefault.itemValueTypes;
+ return getConstraintType() == XSConstants.VC_NONE ?
+ null :
+ fDefault.itemValueTypes;
}
} // class XSAttributeDecl
1.8 +10 -4
xml-xerces/java/src/org/apache/xerces/impl/xs/XSAttributeUseImpl.java
Index: XSAttributeUseImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/XSAttributeUseImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSAttributeUseImpl.java 6 Oct 2004 15:14:54 -0000 1.7
+++ XSAttributeUseImpl.java 7 Dec 2004 18:11:27 -0000 1.8
@@ -117,15 +117,21 @@
}
public Object getActualVC() {
- return fDefault.actualValue;
+ return getConstraintType() == XSConstants.VC_NONE ?
+ null :
+ fDefault.actualValue;
}
public short getActualVCType() {
- return fDefault.actualValueType;
+ return getConstraintType() == XSConstants.VC_NONE ?
+ XSConstants.UNAVAILABLE_DT :
+ fDefault.actualValueType;
}
public ShortList getItemValueTypes() {
- return fDefault.itemValueTypes;
+ return getConstraintType() == XSConstants.VC_NONE ?
+ null :
+ fDefault.itemValueTypes;
}
} // class XSAttributeUseImpl
1.19 +10 -4
xml-xerces/java/src/org/apache/xerces/impl/xs/XSElementDecl.java
Index: XSElementDecl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/XSElementDecl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XSElementDecl.java 6 Oct 2004 15:14:55 -0000 1.18
+++ XSElementDecl.java 7 Dec 2004 18:11:27 -0000 1.19
@@ -346,15 +346,21 @@
}
public Object getActualVC() {
- return fDefault.actualValue;
+ return getConstraintType() == XSConstants.VC_NONE ?
+ null :
+ fDefault.actualValue;
}
public short getActualVCType() {
- return fDefault.actualValueType;
+ return getConstraintType() == XSConstants.VC_NONE ?
+ XSConstants.UNAVAILABLE_DT :
+ fDefault.actualValueType;
}
public ShortList getItemValueTypes() {
- return fDefault.itemValueTypes;
+ return getConstraintType() == XSConstants.VC_NONE ?
+ null :
+ fDefault.itemValueTypes;
}
} // class XSElementDecl
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
