--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/StandardDocFileFactory.java	Fri Jul 28 15:00:53 2017 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/StandardDocFileFactory.java	Wed Aug 02 09:26:35 2017 -0700
@@ -202,11 +202,7 @@
 
             try {
                 OutputStream out = getFileObjectForOutput(path).openOutputStream();
-                if (configuration.docencoding == null) {
-                    return new BufferedWriter(new OutputStreamWriter(out));
-                } else {
-                    return new BufferedWriter(new OutputStreamWriter(out, configuration.docencoding));
-                }
+                return new BufferedWriter(new OutputStreamWriter(out, configuration.docencoding));
             } catch (IOException e) {
                 throw new DocFileIOException(this, DocFileIOException.Mode.WRITE, e);
             }