--- jsr166/src/test/tck/ExecutorsTest.java	2010/09/16 00:52:49	1.31
+++ jsr166/src/test/tck/ExecutorsTest.java	2010/10/09 19:30:35	1.34
@@ -220,14 +220,13 @@ public class ExecutorsTest extends JSR16
     }
 
     /**
-     *  Future.get on submitted tasks will time out if they compute too long.
+     * Future.get on submitted tasks will time out if they compute too long.
      */
     public void testTimedCallable() throws Exception {
-        final Runnable sleeper =
-            new RunnableShouldThrow(InterruptedException.class) {
-                public void realRun() throws InterruptedException {
-                    Thread.sleep(LONG_DELAY_MS);
-                }};
+        final Runnable sleeper = new CheckedInterruptedRunnable() {
+            public void realRun() throws InterruptedException {
+                Thread.sleep(LONG_DELAY_MS);
+            }};
         for (ExecutorService executor :
                  new ExecutorService[] {
                      Executors.newSingleThreadExecutor(),
@@ -399,6 +398,9 @@ public class ExecutorsTest extends JSR16
      * Without permissions, calling privilegedCallable throws ACE
      */
     public void testprivilegedCallableWithNoPrivs() throws Exception {
+        // Avoid classloader-related SecurityExceptions in swingui.TestRunner
+        Executors.privilegedCallable(new CheckCCL());
+
         Runnable r = new CheckedRunnable() {
             public void realRun() throws Exception {
                 if (System.getSecurityManager() == null)