Merge commit 'refs/pull/124/head' into develop

Conflicts:
	src/library/scala/util/parsing/combinator/Parsers.scala

2 files changed, 43 insertions, 0 deletions

diff --git a/test/files/run/t4929.check b/test/files/run/t4929.check
new file mode 100644
index 0000000000..0f0c913d55
--- /dev/null
+++ b/test/files/run/t4929.check
@@ -0,0 +1 @@
+success
\ No newline at end of file
diff --git a/test/files/run/t4929.scala b/test/files/run/t4929.scala
new file mode 100644
index 0000000000..3208cd1b09
--- /dev/null
+++ b/test/files/run/t4929.scala
@@ -0,0 +1,42 @@
+import scala.util.parsing.json._
+import java.util.concurrent._
+import collection.JavaConversions._
+
+object Test extends App {
+
+  val LIMIT = 2000
+  val THREAD_COUNT = 20
+  val count = new java.util.concurrent.atomic.AtomicInteger(0)
+
+  val begin = new CountDownLatch(THREAD_COUNT)
+  val finish = new CountDownLatch(THREAD_COUNT)
+
+  val errors = new ConcurrentLinkedQueue[Throwable]
+
+  (1 to THREAD_COUNT) foreach { i =>
+    val thread = new Thread {
+      override def run() {
+        begin.await(1, TimeUnit.SECONDS)
+        try {
+          while (count.getAndIncrement() < LIMIT && errors.isEmpty) {
+            JSON.parseFull("""{"foo": [1,2,3,4]}""")
+          }
+        } catch {
+          case t: Throwable => errors.add(t)
+        }
+
+        finish.await(10, TimeUnit.SECONDS)
+      }
+    }
+
+    thread.setDaemon(true)
+    thread.start()
+
+  }
+
+
+  errors foreach { throw(_) }
+
+  println("success")
+
+}