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

*** 30,40 ****
  import java.nio.file.Paths;
  import java.util.ArrayList;
  import java.util.HashSet;
  import java.util.LinkedHashSet;
  import java.util.List;
- import java.util.Map;
  import java.util.Set;
  
  import javax.lang.model.element.Element;
  import javax.lang.model.element.ElementKind;
  import javax.tools.JavaFileObject;
--- 30,39 ----
*** 119,140 ****
              // force the use of Messager as a Log
              messager = Messager.instance0(context);
  
              return new JavadocTool(context);
          } catch (CompletionFailure ex) {
              messager.error(Position.NOPOS, ex.getMessage());
              return null;
          }
      }
  
!     public DocletEnvironment getEnvironment(Map<ToolOption,
!             Object> jdtoolOpts,
              List<String> javaNames,
              Iterable<? extends JavaFileObject> fileObjects) throws ToolException {
          toolEnv = ToolEnvironment.instance(context);
!         toolEnv.initialize(jdtoolOpts);
!         ElementsTable etable = new ElementsTable(context, jdtoolOpts);
          javadocFinder.sourceCompleter = etable.xclasses
                  ? Completer.NULL_COMPLETER
                  : sourceCompleter;
  
          if (etable.xclasses) {
--- 118,139 ----
              // force the use of Messager as a Log
              messager = Messager.instance0(context);
  
              return new JavadocTool(context);
          } catch (CompletionFailure ex) {
+             assert messager != null;
              messager.error(Position.NOPOS, ex.getMessage());
              return null;
          }
      }
  
!     public DocletEnvironment getEnvironment(ToolOptions toolOptions,
              List<String> javaNames,
              Iterable<? extends JavaFileObject> fileObjects) throws ToolException {
          toolEnv = ToolEnvironment.instance(context);
!         toolEnv.initialize(toolOptions);
!         ElementsTable etable = new ElementsTable(context, toolOptions);
          javadocFinder.sourceCompleter = etable.xclasses
                  ? Completer.NULL_COMPLETER
                  : sourceCompleter;
  
          if (etable.xclasses) {