Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package java-17-openjdk for openSUSE:Factory
checked in at 2022-03-22 19:39:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-17-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-17-openjdk.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-17-openjdk"
Tue Mar 22 19:39:42 2022 rev:9 rq:963792 version:17.0.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-17-openjdk/java-17-openjdk.changes
2022-03-20 20:55:39.514535956 +0100
+++
/work/SRC/openSUSE:Factory/.java-17-openjdk.new.25692/java-17-openjdk.changes
2022-03-22 19:39:46.455063100 +0100
@@ -1,0 +2,8 @@
+Mon Mar 21 20:25:50 UTC 2022 - Fridrich Strba <[email protected]>
+
+- Added patch:
+ * JDK-8282944.patch
+ + Upstream fix for JDK-8281944: JavaDoc throws
+ java.lang.IllegalStateException: ERRONEOUS
+
+-------------------------------------------------------------------
New:
----
JDK-8282944.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-17-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.KsDwz1/_old 2022-03-22 19:39:47.891064606 +0100
+++ /var/tmp/diff_new_pack.KsDwz1/_new 2022-03-22 19:39:47.895064611 +0100
@@ -211,6 +211,7 @@
Patch200: ppc_stack_overflow_fix.patch
Patch201: fix_armv6_build.patch
#
+Patch300: JDK-8282944.patch
Patch302: disable-doclint-by-default.patch
Patch303: alternative-tzdb_dat.patch
#
@@ -492,6 +493,7 @@
%patch201
%endif
+%patch300 -p1
%patch302 -p1
%patch303 -p1
++++++ JDK-8282944.patch ++++++
---
a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++
b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -1015,6 +1015,9 @@ public class HtmlDocletWriter {
// @see reference label...
label = ref.subList(1, ref.size());
}
+ case ERRONEOUS -> {
+ return
HtmlTree.SPAN(Text.of(resources.getText("doclet.tag.invalid_input", seeText)));
+ }
default ->
throw new
IllegalStateException(ref.get(0).getKind().toString());
}
--- a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java
@@ -23,15 +23,19 @@
/*
* @test
- * @bug 8017191 8182765 8200432 8239804 8250766 8262992
+ * @bug 8017191 8182765 8200432 8239804 8250766 8262992 8281944
* @summary Javadoc is confused by at-link to imported classes outside of the
set of generated packages
- * @library ../../lib
+ * @library /tools/lib ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
- * @build javadoc.tester.*
+ * @build toolbox.ToolBox javadoc.tester.*
* @run main TestSeeTag
*/
import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.io.IOException;
+import java.nio.file.Path;
public class TestSeeTag extends JavadocTester {
@@ -105,4 +109,40 @@ public class TestSeeTag extends JavadocTester {
</dd>
</dl>""");
}
+
+ ToolBox tb = new ToolBox();
+
+ @Test
+ public void testErroneous() throws IOException {
+ Path src = Path.of("erroneous", "src");
+ tb.writeJavaFiles(src, """
+ package erroneous;
+ /**
+ * Comment.
+ * @see <a href="
+ */
+ public class C {
+ private C() { }
+ }
+ """);
+
+ javadoc("-d", Path.of("erroneous", "api").toString(),
+ "-sourcepath", src.toString(),
+ "--no-platform-links",
+ "erroneous");
+ checkExit(Exit.ERROR);
+
+ checkOutput("erroneous/C.html", true,
+ """
+ <dl class="notes">
+ <dt>See Also:</dt>
+ <dd>
+ <ul class="see-list">
+ <li><span>invalid input: '<a href="'</span></li>
+ </ul>
+ </dd>
+ </dl>
+ """);
+
+ }
}
