From ef86480c8fb22e0e9b2ce36d748331a016a00a72 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 21 Nov 2012 08:41:28 -0500 Subject: [PATCH] concurrent restrictions: Untagged should be set based on the task's tags, not the tags of all tasks. --- tasks/ConcurrentRestrictions.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tasks/ConcurrentRestrictions.scala b/tasks/ConcurrentRestrictions.scala index 4c6f50fc5..f6d595ce6 100644 --- a/tasks/ConcurrentRestrictions.scala +++ b/tasks/ConcurrentRestrictions.scala @@ -91,8 +91,9 @@ object ConcurrentRestrictions 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 un = if(base.isEmpty) update(base, Untagged, 1)(f) else base + val aTags = get(a) + val base = merge(m, aTags)(f) + val un = if(aTags.isEmpty) update(base, Untagged, 1)(f) else base update(un, All, 1)(f) }