You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@apache.org on 2001/01/29 12:49:17 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/stree Child.java DocImpl.java ElementImpl.java Parent.java SourceTreeHandler.java
sboag 01/01/29 03:49:17
Modified: java/src/org/apache/xalan/stree Child.java DocImpl.java
ElementImpl.java Parent.java SourceTreeHandler.java
Log:
Fixed some minor threading issues.
Revision Changes Path
1.17 +3 -0 xml-xalan/java/src/org/apache/xalan/stree/Child.java
Index: Child.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/Child.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Child.java 2001/01/07 03:59:23 1.16
+++ Child.java 2001/01/29 11:49:02 1.17
@@ -295,6 +295,8 @@
public Node getNextSibling()
{
+// synchronized (m_doc)
+// {
if (null != m_next)
return m_next;
else if (!m_parent.m_isComplete)
@@ -320,6 +322,7 @@
}
}
}
+// }
return m_next;
}
1.5 +7 -7 xml-xalan/java/src/org/apache/xalan/stree/DocImpl.java
Index: DocImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/DocImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DocImpl.java 2001/01/24 14:41:27 1.4
+++ DocImpl.java 2001/01/29 11:49:03 1.5
@@ -69,11 +69,11 @@
public abstract class DocImpl extends Parent
{
- /** Aid to assigning a unique ID to the tree. */
- static int m_idCount = 0;
-
- /** The unique ID of this tree. */
- int m_id;
+// /** Aid to assigning a unique ID to the tree. */
+// static int m_idCount = 0;
+//
+// /** The unique ID of this tree. */
+// int m_id;
/** This holds all the characters used, copied from the
* characters events. This allows us to not have to allocate
@@ -96,7 +96,7 @@
{
super(null);
m_chars = new FastStringBuffer(1024 * 8);
- m_id = m_idCount++;
+// m_id = m_idCount++;
}
/**
@@ -106,7 +106,7 @@
{
super(null);
m_chars = new FastStringBuffer(charBufSize);
- m_id = m_idCount++;
+// m_id = m_idCount++;
}
1.25 +4 -1 xml-xalan/java/src/org/apache/xalan/stree/ElementImpl.java
Index: ElementImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/ElementImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ElementImpl.java 2001/01/07 03:59:23 1.24
+++ ElementImpl.java 2001/01/29 11:49:04 1.25
@@ -490,7 +490,10 @@
*/
public int getAttrCount()
{
- return m_attrsEnd;
+ synchronized (m_doc)
+ {
+ return m_attrsEnd;
+ }
}
/**
1.21 +3 -0 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Parent.java 2001/01/24 14:41:27 1.20
+++ Parent.java 2001/01/29 11:49:06 1.21
@@ -150,6 +150,8 @@
public boolean hasChildNodes()
{
+// synchronized (m_doc)
+// {
if (0 != m_childCount)
return true;
else
@@ -180,6 +182,7 @@
return (0 == m_childCount) ? false : true;
}
+// }
}
/**
1.33 +3 -4 xml-xalan/java/src/org/apache/xalan/stree/SourceTreeHandler.java
Index: SourceTreeHandler.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/SourceTreeHandler.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- SourceTreeHandler.java 2001/01/12 23:14:36 1.32
+++ SourceTreeHandler.java 2001/01/29 11:49:07 1.33
@@ -100,8 +100,8 @@
*/
public class SourceTreeHandler extends org.xml.sax.helpers.DefaultHandler implements TransformerHandler, DeclHandler, DTDHandler
{
- static int m_idCount = 0;
- int m_id;
+// static int m_idCount = 0;
+// int m_id;
/**
* Create a SourceTreeHandler that will start a transformation as
@@ -124,7 +124,7 @@
*/
public SourceTreeHandler(TransformerImpl transformer, boolean doFragment)
{
- m_id = m_idCount++;
+// m_id = m_idCount++;
m_transformer = transformer;
XPathContext xctxt = ((TransformerImpl) transformer).getXPathContext();
@@ -428,7 +428,6 @@
// System.out.println("endDocument: "+m_id);
m_root.setComplete(true);
- notifyWaiters();
popShouldStripWhitespace();