From 492f5f52141ecd71f2decdbf7eda7aed51dfb64c Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 14 Oct 2010 05:10:25 +0000 Subject: Fixing issue with XMLEventReader.stop failing t... Fixing issue with XMLEventReader.stop failing to stop the parser thread. Contributed by Jean-Laurent Huynh, reviewed by extempore. Closes #3881. --- src/library/scala/xml/pull/XMLEventReader.scala | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) mode change 100755 => 100644 src/library/scala/xml/pull/XMLEventReader.scala (limited to 'src') diff --git a/src/library/scala/xml/pull/XMLEventReader.scala b/src/library/scala/xml/pull/XMLEventReader.scala old mode 100755 new mode 100644 index d51202f2d8..100d4fec71 --- a/src/library/scala/xml/pull/XMLEventReader.scala +++ b/src/library/scala/xml/pull/XMLEventReader.scala @@ -52,6 +52,7 @@ class XMLEventReader(src: Source) extends ProducerConsumerIterator[XMLEvent] // or at least as much as it can fit in the queue.) def stop = { produce(POISON) + parser.pause() parserThread.interrupt() } @@ -87,8 +88,21 @@ class XMLEventReader(src: Source) extends ProducerConsumerIterator[XMLEvent] def entityRef(pos: Int, n: String) = setEvent(EvEntityRef(n)) def text(pos: Int, txt:String) = setEvent(EvText(txt)) + // use to make thread sleep on XMLEventReader.stop + @volatile private var pauseRequested = false + // requesting this thread to sleep so that it can be interrupted. + def pause() { pauseRequested = true } + override def run() { - curInput = input + curInput = new Source { + val iter = new Iterator[Char] { + def hasNext = input.hasNext + def next() = { + if (pauseRequested) Thread.sleep(1000) + input.next() + } + } + } interruptibly { this.initialize.document() } setEvent(POISON) } -- cgit v1.2.3