# HG changeset patch # User kizune # Date 1380632611 -14400 # Node ID b094c3a8c9179918af71d44f90b759ce832a3480 # Parent a8910a0bdbe64b32a143f6808ebdf6bbc47ca18b 7118749: NPE in CreateSymbols caused by bad diagnostic Reviewed-by: jjg diff -r a8910a0bdbe6 -r b094c3a8c917 langtools/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java --- a/langtools/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java Sat Sep 28 13:46:14 2013 -0400 +++ b/langtools/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java Tue Oct 01 17:03:31 2013 +0400 @@ -107,15 +107,21 @@ if (renv.processingOver()) createSymbols(); } catch (IOException e) { + CharSequence msg = e.getLocalizedMessage(); + if (msg == null) + msg = e.toString(); processingEnv.getMessager() - .printMessage(Diagnostic.Kind.ERROR, e.getLocalizedMessage()); + .printMessage(Diagnostic.Kind.ERROR, msg); } catch (Throwable t) { t.printStackTrace(); Throwable cause = t.getCause(); if (cause == null) cause = t; + CharSequence msg = cause.getLocalizedMessage(); + if (msg == null) + msg = cause.toString(); processingEnv.getMessager() - .printMessage(Diagnostic.Kind.ERROR, cause.getLocalizedMessage()); + .printMessage(Diagnostic.Kind.ERROR, msg); } return true; }