wait for thread pool to be idle before executing testsR_3_7_0

2 files changed, 8 insertions, 0 deletions

diff --git a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/operations/OperationUtil.java b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/operations/OperationUtil.java
index 6288f6a1..a154b860 100644
--- a/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/operations/OperationUtil.java
+++ b/org.eclipse.mylyn.commons.core/src/org/eclipse/mylyn/commons/core/operations/OperationUtil.java
@@ -103,6 +103,7 @@ public class OperationUtil {
 			try {
 				return future.get(POLL_INTERVAL, TimeUnit.MILLISECONDS);
 			} catch (ExecutionException e) {
+				// XXX this hides the original stack trace from the caller invoking execute() 
 				throw e.getCause();
 			} catch (TimeoutException ignored) {
 			}
diff --git a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/WebUtilTest.java b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/WebUtilTest.java
index 2e196e28..3dd99a0b 100644
--- a/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/WebUtilTest.java
+++ b/org.eclipse.mylyn.commons.tests/src/org/eclipse/mylyn/commons/tests/net/WebUtilTest.java
@@ -234,6 +234,13 @@ public class WebUtilTest extends TestCase {
 	}
 
 	public void testReadTimeout() throws Exception {
+		// wait 5 seconds for thread pool to be idle
+		for (int i = 0; i < 10; i++) {
+			if (((ThreadPoolExecutor) CommonsNetPlugin.getExecutorService()).getActiveCount() == 0) {
+				break;
+			}
+			Thread.sleep(500);
+		}
 		assertEquals(0, ((ThreadPoolExecutor) CommonsNetPlugin.getExecutorService()).getActiveCount());
 
 		String url = "http://" + proxyAddress.getHostName() + ":" + proxyAddress.getPort() + "/";