minchau 2004/07/22 15:46:31
Modified: java/src/org/apache/xalan/xsltc/dom DOMAdapter.java
Log:
Submitted by: Yash Talwar
Reviewed by: Brian Minchau
Fix for bugzilla 28796
Revision Changes Path
1.24 +13 -3
xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMAdapter.java
Index: DOMAdapter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMAdapter.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DOMAdapter.java 16 Feb 2004 22:54:59 -0000 1.23
+++ DOMAdapter.java 22 Jul 2004 22:46:31 -0000 1.24
@@ -225,12 +225,22 @@
}
public int getExpandedTypeID(final int node) {
+ final short[] mapping = getMapping();
+ final int type;
if (_enhancedDOM != null) {
- return getMapping()[_enhancedDOM.getExpandedTypeID2(node)];
+ type = mapping[_enhancedDOM.getExpandedTypeID2(node)];
}
else {
- return getMapping()[_dom.getExpandedTypeID(node)];
+ if(null != mapping)
+ {
+ type = mapping[_dom.getExpandedTypeID(node)];
+ }
+ else
+ {
+ type = _dom.getExpandedTypeID(node);
+ }
}
+ return type;
}
public int getNamespaceType(final int node) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
