From 2c2ca43c15bc44a4bb6319e3c08238c829ba3a5a Mon Sep 17 00:00:00 2001 From: Priya Lakshmi Muthuswamy Date: Fri, 22 Feb 2019 19:58:22 +0530 Subject: [PATCH] 8219575: jdk/javadoc/tool/removeOldDoclet/RemoveOldDoclet test fails in mach5 Reviewed-by: hannesw --- .../share/classes/jdk/javadoc/internal/tool/Start.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java index 54798ddb2d3..cccd66b0da2 100644 --- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java +++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java @@ -756,6 +756,13 @@ public class Start extends ToolOption.Helper { } String text = messager.getText("main.doclet_class_not_found", userDocletName); throw new ToolException(CMDERR, text, cnfe); + } catch (NoClassDefFoundError ncfe) { + if (ncfe.getMessage().contains("com/sun/javadoc/Doclet")) { + String text = messager.getText("main.not_a_doclet", userDocletName); + throw new ToolException(ERROR, text, ncfe); + } else { + throw ncfe; + } } }