src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java

rev 48841 : [mq]: 8187950

@@ -36,10 +36,11 @@
 
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
 
 import com.sun.tools.javac.code.ClassFinder;
+import com.sun.tools.javac.code.DeferredCompletionFailureHandler;
 import com.sun.tools.javac.code.Symbol.Completer;
 import com.sun.tools.javac.code.Symbol.CompletionFailure;
 import com.sun.tools.javac.comp.Enter;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCClassDecl;

@@ -68,10 +69,11 @@
 public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
     ToolEnvironment toolEnv;
 
     final Messager messager;
     final ClassFinder javadocFinder;
+    final DeferredCompletionFailureHandler dcfh;
     final Enter javadocEnter;
     final Set<JavaFileObject> uniquefiles;
 
     /**
      * Construct a new JavaCompiler processor, using appropriately

@@ -79,10 +81,11 @@
      */
     protected JavadocTool(Context context) {
         super(context);
         messager = Messager.instance0(context);
         javadocFinder = JavadocClassFinder.instance(context);
+        dcfh = DeferredCompletionFailureHandler.instance(context);
         javadocEnter = JavadocEnter.instance(context);
         uniquefiles = new HashSet<>();
     }
 
     /**

@@ -206,10 +209,11 @@
                 return null;
             }
 
             etable.setClassDeclList(listClasses(classTrees.toList()));
 
+            dcfh.setHandler(dcfh.userCodeHandler);
             etable.analyze();
         } catch (CompletionFailure cf) {
             throw new ToolException(ABNORMAL, cf.getMessage(), cf);
         } catch (Abort abort) {
             if (messager.hasErrors()) {