You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by jk...@apache.org on 2001/11/08 20:14:53 UTC
cvs commit: xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm SAX2DTM.java
jkesselm 01/11/08 11:14:53
Modified: java/src/org/apache/xml/dtm/ref/dom2dtm DOM2DTM.java
java/src/org/apache/xml/dtm/ref/sax2dtm SAX2DTM.java
Log:
Bugzilla 4735: We should at least report an error when we overflow DTM addressing...
Revision Changes Path
1.18 +11 -0 xml-xalan/java/src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java
Index: DOM2DTM.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/dom2dtm/DOM2DTM.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DOM2DTM.java 2001/10/01 15:36:17 1.17
+++ DOM2DTM.java 2001/11/08 19:14:52 1.18
@@ -79,6 +79,8 @@
import org.apache.xml.utils.XMLString;
import org.apache.xml.utils.XMLStringFactory;
+import org.apache.xalan.res.XSLTErrorResources;
+import org.apache.xalan.res.XSLMessages;
/** The <code>DOM2DTM</code> class serves up a DOM's contents via the
* DTM API.
@@ -207,6 +209,15 @@
int previousSibling, int forceNodeType)
{
int nodeIndex = m_nodes.size();
+ // Report DTM overflow
+ if(nodeIndex>DTMManager.IDENT_NODE_DEFAULT)
+ {
+ // %REVIEW% Wrong error message, but I've been told we're trying
+ // not to add messages right not for I18N reasons.
+ // %REVIEW% Should this be a Fatal Error?
+ error(XSLMessages.createMessage(XSLTErrorResources.ER_NO_DTMIDS_AVAIL, null));//"No more DTM IDs are available";
+ }
+
m_size++;
// ensureSize(nodeIndex);
1.19 +9 -1 xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
Index: SAX2DTM.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SAX2DTM.java 2001/10/01 15:36:17 1.18
+++ SAX2DTM.java 2001/11/08 19:14:53 1.19
@@ -809,9 +809,17 @@
int parentIndex, int previousSibling,
int dataOrPrefix, boolean canHaveFirstChild)
{
-
// Common to all nodes:
int nodeIndex = m_size++;
+
+ // Report DTM overflow
+ if(nodeIndex>DTMManager.IDENT_NODE_DEFAULT)
+ {
+ // %REVIEW% Wrong error message, but I've been told we're trying
+ // not to add messages right not for I18N reasons.
+ // %REVIEW% Should this be a Fatal Error?
+ error(XSLMessages.createMessage(XSLTErrorResources.ER_NO_DTMIDS_AVAIL, null));//"No more DTM IDs are available";
+ }
m_firstch.addElement(canHaveFirstChild ? NOTPROCESSED : DTM.NULL);
m_nextsib.addElement(NOTPROCESSED);
m_prevsib.addElement(previousSibling);
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org