luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix deadlock caused by lazy val synchronization

This commit is contained in:
Mark Harrah 2011-02-05 21:34:17 -05:00
parent 3f0633c06f
commit 191c19dc2b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ivy/Ivy.scala
View File

@ -34,7 +34,7 @@ final class IvySbt(val configuration: IvyConfiguration)
private def withDefaultLogger[T](f: => T): T = private def withDefaultLogger[T](f: => T): T =
{ {
def action() = def action() =
IvySbt.synchronized IvySbt.synchronized
{ {
val originalLogger = Message.getDefaultLogger val originalLogger = Message.getDefaultLogger
Message.setDefaultLogger(logger) Message.setDefaultLogger(logger)
@ -93,7 +93,9 @@ final class IvySbt(val configuration: IvyConfiguration)
def withModule[T](f: (Ivy,DefaultModuleDescriptor,String) => T): T = def withModule[T](f: (Ivy,DefaultModuleDescriptor,String) => T): T =
withIvy[T] { ivy => f(ivy, moduleDescriptor, defaultConfig) } withIvy[T] { ivy => f(ivy, moduleDescriptor, defaultConfig) }
lazy val (moduleDescriptor: DefaultModuleDescriptor, defaultConfig: String) = def moduleDescriptor = IvySbt.synchronized { moduleDescriptor0 }
def defaultConfig = IvySbt.synchronized { defaultConfig0 }
private[this] lazy val (moduleDescriptor0: DefaultModuleDescriptor, defaultConfig0: String) =
{ {
val (baseModule, baseConfiguration) = val (baseModule, baseConfiguration) =
moduleSettings match moduleSettings match