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

concurrent restrictions: Untagged should be set based on the task's tags, not the tags of all tasks.

This commit is contained in:
Mark Harrah 2012-11-21 08:41:28 -05:00
parent b8d111dcae
commit ef86480c8f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasks/ConcurrentRestrictions.scala
View File

@ -91,8 +91,9 @@ object ConcurrentRestrictions
private[this] def merge[A](m: TagMap, a: A, get: A => TagMap)(f: (Int,Int) => Int): TagMap = private[this] def merge[A](m: TagMap, a: A, get: A => TagMap)(f: (Int,Int) => Int): TagMap =
{ {
val base = merge(m, get(a))(f) val aTags = get(a)
val un = if(base.isEmpty) update(base, Untagged, 1)(f) else base val base = merge(m, aTags)(f)
val un = if(aTags.isEmpty) update(base, Untagged, 1)(f) else base
update(un, All, 1)(f) update(un, All, 1)(f)
} }