You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ne...@apache.org on 2001/10/02 23:42:57 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl/v2 SchemaNamespaceSupport.java XSDElementTraverser.java
neilg 01/10/02 14:42:57
Modified: java/src/org/apache/xerces/impl/v2
SchemaNamespaceSupport.java
XSDElementTraverser.java
Log:
fix a NPE in the SchemaNamespaceSupport class and make sure local element traversing is handled correctly when XSDHandler is reset.
Revision Changes Path
1.2 +6 -6 xml-xerces/java/src/org/apache/xerces/impl/v2/SchemaNamespaceSupport.java
Index: SchemaNamespaceSupport.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/SchemaNamespaceSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaNamespaceSupport.java 2001/09/18 21:51:57 1.1
+++ SchemaNamespaceSupport.java 2001/10/02 21:42:57 1.2
@@ -66,7 +66,7 @@
*
* @author Neil Graham, IBM
*
- * @version $Id: SchemaNamespaceSupport.java,v 1.1 2001/09/18 21:51:57 neilg Exp $
+ * @version $Id: SchemaNamespaceSupport.java,v 1.2 2001/10/02 21:42:57 neilg Exp $
*/
public class SchemaNamespaceSupport
extends NamespaceSupport {
@@ -118,14 +118,14 @@
String [] getEffectiveLocalContext() {
// the trick here is to recognize that all local contexts
// happen to start at fContext[2].
- int topLocalContext = (fCurrentContext >= 2) ? fContext[2]:-1;
- if (topLocalContext == -1) {
+ int bottomLocalContext = (fCurrentContext >= 2) ? fContext[2]:-1;
+ if (bottomLocalContext == -1) {
// no local decls!
return null;
}
- String [] returnVal = new String[fNamespaceSize-topLocalContext+1];
- System.arraycopy(fNamespace, 0, returnVal, 0,
- topLocalContext);
+ String [] returnVal = new String[fNamespaceSize-bottomLocalContext];
+ System.arraycopy(fNamespace, bottomLocalContext, returnVal, 0,
+ fNamespaceSize-bottomLocalContext);
return returnVal;
} // getEffectiveLocalContext():String
1.19 +4 -2 xml-xerces/java/src/org/apache/xerces/impl/v2/XSDElementTraverser.java
Index: XSDElementTraverser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSDElementTraverser.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XSDElementTraverser.java 2001/09/28 21:33:50 1.18
+++ XSDElementTraverser.java 2001/10/02 21:42:57 1.19
@@ -62,6 +62,7 @@
import org.apache.xerces.util.DOMUtil;
import org.apache.xerces.util.XInt;
import org.apache.xerces.util.XIntPool;
+import org.apache.xerces.util.SymbolTable;
import org.apache.xerces.xni.QName;
import org.w3c.dom.Element;
@@ -88,7 +89,7 @@
*
* @author Sandy Gao, IBM
*
- * @version $Id: XSDElementTraverser.java,v 1.18 2001/09/28 21:33:50 lmartin Exp $
+ * @version $Id: XSDElementTraverser.java,v 1.19 2001/10/02 21:42:57 neilg Exp $
*/
class XSDElementTraverser extends XSDAbstractTraverser {
@@ -497,7 +498,8 @@
return ret;
}
- void reset() {
+ void reset(XMLErrorReporter reporter, SymbolTable symbolTable) {
+ super.reset(reporter, symbolTable);
fDeferTraversingLocalElements = true;
} // reset()
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org