aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStoyan Boshev2011-11-17 10:33:17 (EST)
committerStoyan Boshev2011-11-17 10:33:17 (EST)
commit334028c618932aac912900b5f724e7906ef9f3cc (patch)
treec1f5febe7dab012088c0bb5633e358292dfbe7cb
parent13d0e06a500e6db6f059ae9e07eb8246753bfae9 (diff)
downloadrt.equinox.bundles-334028c618932aac912900b5f724e7906ef9f3cc.zip
rt.equinox.bundles-334028c618932aac912900b5f724e7906ef9f3cc.tar.gz
rt.equinox.bundles-334028c618932aac912900b5f724e7906ef9f3cc.tar.bz2
Revert "Revert "Bug 360105 [DS] SCRManager waits too long to enable components""
-rw-r--r--bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/SCRManager.java4
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 f53b965..6ca9b2d 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);
}