diff options
author | Paul Phillips <paulp@improving.org> | 2010-10-19 15:03:08 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-10-19 15:03:08 +0000 |
commit | 26ac638650e2da23d2d97194bf13b5b9162ac181 (patch) | |
tree | f158017f04d031c07fa498d41fcb37d51fd9df52 /src/library | |
parent | 79389bc80d08b18e20372c181a5749b8efc9614d (diff) | |
download | scala-26ac638650e2da23d2d97194bf13b5b9162ac181.tar.gz scala-26ac638650e2da23d2d97194bf13b5b9162ac181.tar.bz2 scala-26ac638650e2da23d2d97194bf13b5b9162ac181.zip |
Reverts r23251 because it hangs on windows.
Diffstat (limited to 'src/library')
-rwxr-xr-x[-rw-r--r--] | src/library/scala/xml/pull/XMLEventReader.scala | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/library/scala/xml/pull/XMLEventReader.scala b/src/library/scala/xml/pull/XMLEventReader.scala index 100d4fec71..d51202f2d8 100644..100755 --- a/src/library/scala/xml/pull/XMLEventReader.scala +++ b/src/library/scala/xml/pull/XMLEventReader.scala @@ -52,7 +52,6 @@ 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() } @@ -88,21 +87,8 @@ 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 = new Source { - val iter = new Iterator[Char] { - def hasNext = input.hasNext - def next() = { - if (pauseRequested) Thread.sleep(1000) - input.next() - } - } - } + curInput = input interruptibly { this.initialize.document() } setEvent(POISON) } |