diff options
| author | Stoyan Boshev | 2011-11-17 15:33:17 +0000 |
|---|---|---|
| committer | Stoyan Boshev | 2011-11-17 15:33:17 +0000 |
| commit | 334028c618932aac912900b5f724e7906ef9f3cc (patch) | |
| tree | c1f5febe7dab012088c0bb5633e358292dfbe7cb | |
| parent | 13d0e06a500e6db6f059ae9e07eb8246753bfae9 (diff) | |
| download | rt.equinox.bundles-334028c618932aac912900b5f724e7906ef9f3cc.tar.gz rt.equinox.bundles-334028c618932aac912900b5f724e7906ef9f3cc.tar.xz rt.equinox.bundles-334028c618932aac912900b5f724e7906ef9f3cc.zip | |
Revert "Revert "Bug 360105 [DS] SCRManager waits too long to enable components""
This reverts commit 13d0e06a500e6db6f059ae9e07eb8246753bfae9.
| -rw-r--r-- | bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java index f53b96537..6ca9b2dfd 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java @@ -645,9 +645,9 @@ public class SCRManager implements ServiceListener, SynchronousBundleListener, C synchronized (components) { long startTime = System.currentTimeMillis(); try { - do { + while (!components.isEmpty() && (System.currentTimeMillis() - startTime < WorkThread.BLOCK_TIMEOUT)) { components.wait(1000); - } while (!components.isEmpty() && (System.currentTimeMillis() - startTime < WorkThread.BLOCK_TIMEOUT)); + } if (System.currentTimeMillis() - startTime >= WorkThread.BLOCK_TIMEOUT) { Activator.log(null, LogService.LOG_WARNING, NLS.bind(Messages.TIMEOUT_REACHED_ENABLING_COMPONENTS, getBundleName(bundle), Integer.toString(WorkThread.BLOCK_TIMEOUT)), null); } |