aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStoyan Boshev2011-11-17 10:27:49 (EST)
committerStoyan Boshev2011-11-17 10:27:49 (EST)
commit13d0e06a500e6db6f059ae9e07eb8246753bfae9 (patch)
tree92ec49776c3634b42b1a1481ed3ca83402041e7d
parentd4520e11e5282d4ed84732be401602aef135ee29 (diff)
downloadrt.equinox.bundles-13d0e06a500e6db6f059ae9e07eb8246753bfae9.zip
rt.equinox.bundles-13d0e06a500e6db6f059ae9e07eb8246753bfae9.tar.gz
rt.equinox.bundles-13d0e06a500e6db6f059ae9e07eb8246753bfae9.tar.bz2
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 6ca9b2d..f53b965 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 {
- while (!components.isEmpty() && (System.currentTimeMillis() - startTime < WorkThread.BLOCK_TIMEOUT)) {
+ do {
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);
}