Author: mrglavas
Date: Wed Aug 30 11:48:49 2006
New Revision: 438585
URL: http://svn.apache.org/viewvc?rev=438585&view=rev
Log:
JIRA Issue #1178
https://issues.apache.org/jira/browse/XERCESJ-1178
Another fix from Hua Lei to ensure that the AsyncSAXParser thread terminates
correctly.
A finalize() method has been added to the SAXXMLStreamReader to terminate the
AsyncSAXParser
thread if it's still active.
Modified:
xerces/java/branches/stax-dev/src/org/apache/xerces/stax/SAXXMLStreamReaderImpl.java
xerces/java/branches/stax-dev/src/org/apache/xerces/stax/StAXSAXHandler.java
Modified:
xerces/java/branches/stax-dev/src/org/apache/xerces/stax/SAXXMLStreamReaderImpl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/stax-dev/src/org/apache/xerces/stax/SAXXMLStreamReaderImpl.java?rev=438585&r1=438584&r2=438585&view=diff
==============================================================================
---
xerces/java/branches/stax-dev/src/org/apache/xerces/stax/SAXXMLStreamReaderImpl.java
(original)
+++
xerces/java/branches/stax-dev/src/org/apache/xerces/stax/SAXXMLStreamReaderImpl.java
Wed Aug 30 11:48:49 2006
@@ -1083,5 +1083,10 @@
}
throw new IllegalStateException("Current event is not
PROCESSING_INSTRUCTION");
}
+
+ protected void finalize() throws Throwable {
+ close();
+ super.finalize();
+ }
}
Modified:
xerces/java/branches/stax-dev/src/org/apache/xerces/stax/StAXSAXHandler.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/stax-dev/src/org/apache/xerces/stax/StAXSAXHandler.java?rev=438585&r1=438584&r2=438585&view=diff
==============================================================================
---
xerces/java/branches/stax-dev/src/org/apache/xerces/stax/StAXSAXHandler.java
(original)
+++
xerces/java/branches/stax-dev/src/org/apache/xerces/stax/StAXSAXHandler.java
Wed Aug 30 11:48:49 2006
@@ -74,11 +74,6 @@
checkCoalescing();
reader.setCurType(XMLStreamConstants.END_DOCUMENT);
- while (asp.getRunningFlag() == false) {
- asp.notify();
- asp.wait();
- }
-
asp.setRunningFlag(false);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
