0
@@ -282,13 +282,15 @@ function spawn_or_use_existing(app_root, options):
0
       count++
0
       active++
0
   else:
0
-		# There are no apps for this app root.
0
-		wait until (active < max)
0
-		# FIXME: there's a possible concurrency issue here. After
0
-		# waiting and having reacquired the lock, the state might have
0
-		# been completely changed, and there may now exist an instance
0
-		# of this application domain.
0
-		if count == max:
0
+		# There are no apps for this app root. Wait until there's at
0
+		# least 1 idle instance, or until there's an empty slot in the
0
+		# pool, then restart this function. Restarting is necessary,
0
+		# because after waiting and reacquiring the lack, some other
0
+		# thread might already have spawned instances for this app root.
0
+		if (active >= max):
0
+			wait until _active_ has changed
0
+			goto beginning of functions
0
+		elsif count == max:
0
       # Here we are in a though situation. There are several
0
       # apps which are inactive, and none of them have
0
       # application root _app_root_, so we must kill one of

0
@@ -518,10 +518,10 @@ private:
0
           activeOrMaxChanged.notify_all();
0
         }
0
       } else {
0
-				while (!(active < max)) {
0
+				if (active >= max) {
0
           activeOrMaxChanged.wait(l);
0
-				}
0
-				if (count == max) {
0
+					goto beginning_of_function;
0
+				} else if (count == max) {
0
           container = inactiveApps.front();
0
           inactiveApps.pop_front();
0
           domain = domains[container->app->getAppRoot()].get();