From babd5aecf6ed4b4e91a270a61ddfd2a17750afd3 Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Tue, 27 Dec 2016 20:22:51 +0300
Subject: [PATCH] javac ast indices: cleanup

---
 .../jps/javac/ast/JavacReferenceCollectorListener.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/ast/JavacReferenceCollectorListener.java b/jps/jps-builders/src/org/jetbrains/jps/javac/ast/JavacReferenceCollectorListener.java
index dfe7d8746105..23f59d9f2922 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/javac/ast/JavacReferenceCollectorListener.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/javac/ast/JavacReferenceCollectorListener.java
@@ -16,7 +16,6 @@
 package org.jetbrains.jps.javac.ast;
 
 import com.intellij.util.Consumer;
-import com.intellij.util.ReflectionUtil;
 import com.sun.source.tree.*;
 import com.sun.source.util.*;
 import com.sun.tools.javac.util.ClientCodeException;
@@ -55,7 +54,13 @@ final class JavacReferenceCollectorListener implements TaskListener {
                         boolean divideImportRefs,
                         Consumer<JavacFileData> dataConsumer) {
     JavacTask javacTask = (JavacTask)task;
-    Method addTaskMethod = ReflectionUtil.getMethod(JavacTask.class, "addTaskListener", TaskListener.class); // jdk >= 8
+    Method addTaskMethod; // jdk >= 8
+    try {
+      addTaskMethod = JavacTask.class.getMethod("addTaskListener", TaskListener.class);
+    }
+    catch (NoSuchMethodException e) {
+      throw new RuntimeException(e);
+    }
     final JavacReferenceCollectorListener taskListener = new JavacReferenceCollectorListener(divideImportRefs,
                                                                                              dataConsumer,
                                                                                              javacTask.getElements(),
@@ -63,6 +68,7 @@ final class JavacReferenceCollectorListener implements TaskListener {
                                                                                              Trees.instance(javacTask));
     if (addTaskMethod != null) {
       try {
+        addTaskMethod.setAccessible(true);
         addTaskMethod.invoke(task, taskListener);
       }
       catch (IllegalAccessException e) {