Mercurial > hg > jdk9-shenandoah > langtools
changeset 2713:c3cb06860511
8060448: ArrayIndexOutOfBoundsException with annotation processing printout of empty line
Reviewed-by: jlahoda
author | jfranck |
---|---|
date | Fri, 24 Oct 2014 10:08:51 +0200 |
parents | 1f593bc97283 |
children | b5eeeb11b9d4 |
files | src/jdk.compiler/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java test/tools/javac/util/NewlineOnlyDiagnostic.java |
diffstat | 2 files changed, 48 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java Sat Nov 08 22:00:31 2014 +0000 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java Fri Oct 24 10:08:51 2014 +0200 @@ -111,6 +111,8 @@ Collection<String> args = formatArguments(d, l); String msg = localize(l, d.getCode(), args.toArray()); String[] lines = msg.split("\n"); + if (lines.length == 0) // will happen when msg only contains one or more separators: "\n", "\n\n", etc. + lines = new String[] { "" }; if (getConfiguration().getVisible().contains(DiagnosticPart.SUMMARY)) { currentIndentation += getConfiguration().getIndentation(DiagnosticPart.SUMMARY); buf.append(indent(lines[0], currentIndentation)); //summary
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/util/NewlineOnlyDiagnostic.java Fri Oct 24 10:08:51 2014 +0200 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import javax.annotation.processing.*; +import javax.tools.Diagnostic.Kind; +import javax.lang.model.element.TypeElement; +import java.util.Set; + +/* + * @test + * @bug 8060448 + * @summary Test that javac doesn't throw ArrayIndexOutOfBoundsException + * when logging the message "\n" + * @library /tools/javac/lib + * @build JavacTestingAbstractProcessor NewlineOnlyDiagnostic + * @compile -processor NewlineOnlyDiagnostic NewlineOnlyDiagnostic.java + */ + +public class NewlineOnlyDiagnostic extends JavacTestingAbstractProcessor { + + @Override + public boolean process(Set<? extends TypeElement> types,RoundEnvironment rEnv) { + processingEnv.getMessager().printMessage(Kind.NOTE,"\n"); + return true; + } +}