[KARAF-4723] Make sure satisfied activators are started synchronously Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bff44499 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bff44499 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bff44499
Branch: refs/heads/master Commit: bff4449972dc991e572681d1278249a05d7c2166 Parents: 3062a86 Author: Guillaume Nodet <gno...@apache.org> Authored: Thu Sep 22 12:06:52 2016 +0200 Committer: Guillaume Nodet <gno...@apache.org> Committed: Thu Sep 22 12:06:52 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/karaf/util/tracker/BaseActivator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/bff44499/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java ---------------------------------------------------------------------- diff --git a/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java b/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java index b6e457d..d2c09e1 100644 --- a/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java +++ b/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java @@ -71,7 +71,9 @@ public class BaseActivator implements BundleActivator, Runnable { scheduled.set(true); doOpen(); scheduled.set(false); - if (managedServiceRegistration == null && trackers.isEmpty()) { + if (managedServiceRegistration == null + && trackers.values().stream() + .allMatch(t -> t.getService() != null)) { try { doStart(); } catch (Exception e) {