diff options
author | Paul Phillips <paulp@improving.org> | 2012-05-05 10:36:51 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-05-05 10:36:51 -0700 |
commit | 1a4faa92faaf495f75a6dd2c58376f6bb3fbf44c (patch) | |
tree | a10aca28d70ce0c02a59f13696820150a6dc65bf /test | |
parent | dd8f53d510ad820d5b34b20f2846c8da5d4942a1 (diff) | |
parent | dce6b34c38a6d774961ca6f9fd50b11300ecddd6 (diff) | |
download | scala-1a4faa92faaf495f75a6dd2c58376f6bb3fbf44c.tar.gz scala-1a4faa92faaf495f75a6dd2c58376f6bb3fbf44c.tar.bz2 scala-1a4faa92faaf495f75a6dd2c58376f6bb3fbf44c.zip |
Merge commit 'refs/pull/124/head' into develop
Conflicts:
src/library/scala/util/parsing/combinator/Parsers.scala
Diffstat (limited to 'test')
-rw-r--r-- | test/files/run/t4929.check | 1 | ||||
-rw-r--r-- | test/files/run/t4929.scala | 42 |
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") + +} |