diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
| commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/core-api/src/com/intellij/concurrency/JobScheduler.java | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
| download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'platform/core-api/src/com/intellij/concurrency/JobScheduler.java')
| -rw-r--r-- | platform/core-api/src/com/intellij/concurrency/JobScheduler.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/platform/core-api/src/com/intellij/concurrency/JobScheduler.java b/platform/core-api/src/com/intellij/concurrency/JobScheduler.java index a7e16644363c..30d668088824 100644 --- a/platform/core-api/src/com/intellij/concurrency/JobScheduler.java +++ b/platform/core-api/src/com/intellij/concurrency/JobScheduler.java @@ -81,8 +81,7 @@ public abstract class JobScheduler { private static void enableRemoveOnCancelPolicy(ScheduledThreadPoolExecutor executor) { if (Patches.USE_REFLECTION_TO_ACCESS_JDK7) { try { - Method setRemoveOnCancelPolicy = ScheduledThreadPoolExecutor.class.getDeclaredMethod("setRemoveOnCancelPolicy", boolean.class); - setRemoveOnCancelPolicy.setAccessible(true); + Method setRemoveOnCancelPolicy = ReflectionUtil.getDeclaredMethod(ScheduledThreadPoolExecutor.class, "setRemoveOnCancelPolicy", boolean.class); setRemoveOnCancelPolicy.invoke(executor, true); } catch (Exception ignored) { |