--- a/mxtool/mx.py	Tue Apr 29 11:02:08 2014 +0200
+++ b/mxtool/mx.py	Tue Apr 29 14:26:39 2014 +0200
@@ -3996,7 +3996,13 @@
             try:
                 log('Generating {2} for {0} in {1}'.format(p.name, out, docDir))
                 projectJava = java(p.javaCompliance)
-                run([projectJava.javadoc, memory,
+
+                # Once https://bugs.openjdk.java.net/browse/JDK-8041628 is fixed,
+                # this should be reverted to:
+                # javadocExe = java().javadoc
+                javadocExe = projectJava.javadoc
+
+                run([javadocExe, memory,
                      '-XDignore.symbol.file',
                      '-classpath', cp,
                      '-quiet',