Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Gheorghe2006-05-11 15:45:23 +0000
committerBogdan Gheorghe2006-05-11 15:45:23 +0000
commitfef3428bee4b8fd4adb6d36be2031023874ddef4 (patch)
tree17122e91727e80961f915fb247ed66e77c8b97a4 /tests/org.eclipse.team.tests.cvs.core
parentc08f116b7aeb27a4ee06fe0e20363827c520f34f (diff)
downloadeclipse.platform.team-fef3428bee4b8fd4adb6d36be2031023874ddef4.tar.gz
eclipse.platform.team-fef3428bee4b8fd4adb6d36be2031023874ddef4.tar.xz
eclipse.platform.team-fef3428bee4b8fd4adb6d36be2031023874ddef4.zip
Bug 141326 [CVS Test] OperationCancelledException in EclipseTestI200605111200
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core')
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java28
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
index ecc7d1a3c..5b490427f 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java
@@ -989,21 +989,21 @@ public class EclipseTest extends ResourceTest {
}
protected static void executeHeadless(final TeamOperation op) throws CVSException {
- try {
- EclipseRunnable tempRunnable = new EclipseRunnable(op, DEFAULT_MONITOR);
- Thread tempThread = new Thread(tempRunnable);
- tempThread.start();
- while (tempThread.isAlive()){
- Thread.sleep(100);
- while (Display.getCurrent().readAndDispatch()) {};
- }
- //check for errors
- Exception ex = tempRunnable.getException();
- if (ex instanceof InvocationTargetException)
- throw CVSException.wrapException(ex);
- } catch (InterruptedException e) {
- throw new OperationCanceledException();
+ EclipseRunnable tempRunnable = new EclipseRunnable(op, DEFAULT_MONITOR);
+ Thread tempThread = new Thread(tempRunnable);
+ tempThread.start();
+ while (tempThread.isAlive()) {
+ try {
+ Thread.sleep(100);
+ while (Display.getCurrent().readAndDispatch()) {}
+ } catch (InterruptedException e) {
+ //ignore
+ }
}
+ //check for errors
+ Exception ex = tempRunnable.getException();
+ if (ex instanceof InvocationTargetException)
+ throw CVSException.wrapException(ex);
}
protected void setUp() throws Exception {

Back to the top