From e88589c158fdd689c46a8acd6cebfad7cf638e16 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 23 May 2011 18:40:03 -0400 Subject: [PATCH] fixes #23 --- sbt/src/sbt-test/java/error/Success.java | 3 +++ sbt/src/sbt-test/java/error/changes/Fail.java | 3 +++ sbt/src/sbt-test/java/error/test | 5 +++++ util/log/BufferedLogger.scala | 4 ++-- 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 sbt/src/sbt-test/java/error/Success.java create mode 100644 sbt/src/sbt-test/java/error/changes/Fail.java create mode 100644 sbt/src/sbt-test/java/error/test diff --git a/sbt/src/sbt-test/java/error/Success.java b/sbt/src/sbt-test/java/error/Success.java new file mode 100644 index 000000000..a3025b29b --- /dev/null +++ b/sbt/src/sbt-test/java/error/Success.java @@ -0,0 +1,3 @@ +package test; + +public class Success {} \ No newline at end of file diff --git a/sbt/src/sbt-test/java/error/changes/Fail.java b/sbt/src/sbt-test/java/error/changes/Fail.java new file mode 100644 index 000000000..11aa7a59b --- /dev/null +++ b/sbt/src/sbt-test/java/error/changes/Fail.java @@ -0,0 +1,3 @@ +package test; + +public class Fail { \ No newline at end of file diff --git a/sbt/src/sbt-test/java/error/test b/sbt/src/sbt-test/java/error/test new file mode 100644 index 000000000..dd3c3d272 --- /dev/null +++ b/sbt/src/sbt-test/java/error/test @@ -0,0 +1,5 @@ +> compile + +$ copy changes/Fail.java src/main/java/Fail.java + +-> compile \ No newline at end of file diff --git a/util/log/BufferedLogger.scala b/util/log/BufferedLogger.scala index 37dbbb1df..50598c936 100644 --- a/util/log/BufferedLogger.scala +++ b/util/log/BufferedLogger.scala @@ -20,12 +20,12 @@ class BufferedLogger(delegate: AbstractLogger) extends BasicLogger /** Enables buffering. */ def record() = synchronized { recording = true } - def buffer[T](f: => T): T = synchronized { + def buffer[T](f: => T): T = { record() try { f } finally { stopQuietly() } } - def bufferQuietly[T](f: => T): T = synchronized { + def bufferQuietly[T](f: => T): T = { record() try {