Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2006-01-24 16:00:27 +0000
committerMichael Valenta2006-01-24 16:00:27 +0000
commitd79dabb57b3b620328476fc69e5a3444901892e3 (patch)
treef7df49d595e6c89bb9c1a83f664bf43ae03d034a
parent8ab71c6ef07d0966c68ed06fec3aad788fd85fc1 (diff)
downloadeclipse.platform.team-d79dabb57b3b620328476fc69e5a3444901892e3.tar.gz
eclipse.platform.team-d79dabb57b3b620328476fc69e5a3444901892e3.tar.xz
eclipse.platform.team-d79dabb57b3b620328476fc69e5a3444901892e3.zip
Bug 125015 Test failures during buildI20060124a
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java
index 8c7589529..56376fe34 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java
@@ -64,8 +64,7 @@ public abstract class SubscriberMergeContext extends MergeContext {
handler.start();
if (refresh)
subscriber.refresh(getScope().getTraversals(), monitor);
- else
- handler.waitUntilIdle(monitor);
+ handler.waitUntilIdle(monitor);
}
/* (non-Javadoc)

Back to the top