From 26ac638650e2da23d2d97194bf13b5b9162ac181 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Tue, 19 Oct 2010 15:03:08 +0000
Subject: Reverts r23251 because it hangs on windows.

---
 src/library/scala/xml/pull/XMLEventReader.scala | 16 +--------------
 test/files/run/bug3881.check                    |  1 -
 test/files/run/bug3881.scala                    | 27 -------------------------
 3 files changed, 1 insertion(+), 43 deletions(-)
 mode change 100644 => 100755 src/library/scala/xml/pull/XMLEventReader.scala
 delete mode 100644 test/files/run/bug3881.check
 delete mode 100644 test/files/run/bug3881.scala

diff --git a/src/library/scala/xml/pull/XMLEventReader.scala b/src/library/scala/xml/pull/XMLEventReader.scala
old mode 100644
new mode 100755
index 100d4fec71..d51202f2d8
--- 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)
     }
diff --git a/test/files/run/bug3881.check b/test/files/run/bug3881.check
deleted file mode 100644
index 888acde74f..0000000000
--- a/test/files/run/bug3881.check
+++ /dev/null
@@ -1 +0,0 @@
-1000000 xml events
diff --git a/test/files/run/bug3881.scala b/test/files/run/bug3881.scala
deleted file mode 100644
index 21247492f5..0000000000
--- a/test/files/run/bug3881.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-object Test {
-
-  def forever() = new io.Source {
-    val iter = "<foo>".iterator ++ new Iterator[Char] {
-      var count = -1
-      val bar = "<bar/>\n"
-      def hasNext = true
-      def next() = {
-        count += 1
-        bar(count % bar.length)
-      }
-    }
-  }
-
-  def main(args: Array[String]): Unit = {
-    val src = forever()
-    val reader = new xml.pull.XMLEventReader(src)
-    var count = 0
-    while (reader.hasNext && count < 1000000) {
-      reader.next
-      count += 1
-    }
-    reader.stop
-    println(count + " xml events")
-  }
-}
-
-- 
cgit v1.2.3