infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-03 10:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

8255032: Conflict between recent pushes breaks the build

Browse Source 
Reviewed-by: redestad, vromero
This commit is contained in:
Jonathan Gibbons 2020-10-19 22:05:47 +00:00
parent cb5cdd7705
commit 0f4fb367d5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
View File

@ -117,7 +117,7 @@ public class HtmlDoclet extends AbstractDoclet {
}
@Override // defined by AbstractDoclet
public void generateClassFiles(DocletEnvironment docEnv, ClassTree classTree) throws DocletException {
public void generateClassFiles(ClassTree classTree) throws DocletException {
if (!(configuration.getOptions().noDeprecated()
|| configuration.getOptions().noDeprecatedList())) {
@ -128,7 +128,7 @@ public class HtmlDoclet extends AbstractDoclet {
}
}
super.generateClassFiles(docEnv, classTree);
super.generateClassFiles(classTree);
}
/**