sboag 00/12/31 01:44:15
Modified: java/src/org/apache/xalan/stree Parent.java
Log:
Put a timeout of 100 milliseconds on the waits, so that it can check
for a posted exception every so often.
In AppendChild, don't set the uid and increment the doc order count
if the uid value is non-zero. This so that the StreeDOMBuilder can
set the UID before the append, so that the UIDs on the attributes that
are added before the append will be correct.
Revision Changes Path
1.16 +10 -6 xml-xalan/java/src/org/apache/xalan/stree/Parent.java
Index: Parent.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/Parent.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Parent.java 2000/11/23 04:57:38 1.15
+++ Parent.java 2000/12/31 09:44:15 1.16
@@ -122,7 +122,7 @@
// Here we have to wait until the element is complete
while (!isComplete())
{
- m_doc.wait();
+ m_doc.wait(100);
throwIfParseError();
}
}
@@ -162,7 +162,7 @@
// Only wait until the first child comes, or we are complete.
while (!isComplete())
{
- m_doc.wait();
+ m_doc.wait(100);
throwIfParseError();
if (0 != m_childCount)
@@ -222,7 +222,7 @@
// System.out.println("Waiting... getChild " + i + " " +
getNodeName());
while (!isComplete())
{
- m_doc.wait();
+ m_doc.wait(100);
throwIfParseError();
if (i < m_childCount)
@@ -278,7 +278,7 @@
// System.out.println("Waiting... getChild " + i + " " +
getNodeName());
while (!isComplete())
{
- m_doc.wait();
+ m_doc.wait(100);
throwIfParseError();
if (null != m_first)
@@ -332,8 +332,12 @@
child.m_parent = this;
m_childCount++;
-
- child.m_uid = ++m_doc.m_docOrderCount;
+
+ if(0 == child.m_uid)
+ {
+ child.m_uid = ++m_doc.m_docOrderCount;
+ }
+
child.m_level = (short) (m_level + 1);
if (null == m_first)
