Mercurial > hg > openjdk > jigsaw > jdk
changeset 6372:6cc28cc213b6
7189103: Executors needs to maintain state
Reviewed-by: dholmes, hawtin
| author | chegar |
|---|---|
| date | Thu, 16 Aug 2012 15:02:34 +0100 |
| parents | 983c17aecdac |
| children | a09b9ebb61b6 |
| files | src/share/classes/java/util/concurrent/Executors.java |
| diffstat | 1 files changed, 9 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/util/concurrent/Executors.java Wed Aug 15 15:31:30 2012 -0400 +++ b/src/share/classes/java/util/concurrent/Executors.java Thu Aug 16 15:02:34 2012 +0100 @@ -530,18 +530,17 @@ return AccessController.doPrivileged( new PrivilegedExceptionAction<T>() { public T run() throws Exception { - ClassLoader savedcl = null; Thread t = Thread.currentThread(); - try { - ClassLoader cl = t.getContextClassLoader(); - if (ccl != cl) { - t.setContextClassLoader(ccl); - savedcl = cl; + ClassLoader cl = t.getContextClassLoader(); + if (ccl == cl) { + return task.call(); + } else { + t.setContextClassLoader(ccl); + try { + return task.call(); + } finally { + t.setContextClassLoader(cl); } - return task.call(); - } finally { - if (savedcl != null) - t.setContextClassLoader(savedcl); } } }, acc);