April 2017 - core-libs-dev

JDK 10 RFR JDK-8177153: LambdaMetafactory has default constructor
by Ron Pressler 29 Apr '17

29 Apr '17

Hi. Please review this trivial fix: ------- diff -r 83d37efcd2a5 src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java --- a/src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java Thu Apr 13 20:35:17 2017 +0000 +++ b/src/java.base/share/classes/java/lang/invoke/LambdaMetafactory.java Fri Apr 28 17:51:42 2017 +0000 @@ -213,7 +213,8 @@ * methods. * @since 1.8 */ -public class LambdaMetafactory { +public final class LambdaMetafactory { + private LambdaMetafactory() {} /** Flag for alternate metafactories indicating the lambda object * must be serializable */ ------- Ron

4 5

RFR: 8179415: Update java.management and java.management.rmi to be HTML-5 friendly
by Kumar Srinivasan 28 Apr '17

28 Apr '17

Hello, Please review changes for java.management and java.management.rmi to be HTML5 ready, there are outliers like cellpadding, cellspacing that needs to be done separately, note this was *not* done mechanically by a script. http://cr.openjdk.java.net/~ksrini/8179415/ https://bugs.openjdk.java.net/browse/JDK-8179415 Thanks Kumar

2 1

[JDK9] RFR 8167229: Improve VarHandle documentation
by Paul Sandoz 28 Apr '17

28 Apr '17

Hi, Please review some documentation changes to VarHandle: http://cr.openjdk.java.net/~psandoz/jdk9/JDK-8167229-varhandle-docs/webrev/… There are no changes to the specification. A significant portion of the changes are based on feedback from Alex who observed it’s possible to simplify the specification by removing the notion of shape and focusing on the list of coordinate types (the types of coordinate expressions). Paul.

3 8

JDK 10 RFR JDK-8174267: Stream.findFirst unnecessarily always allocates an Op
by Ron Pressler 28 Apr '17

28 Apr '17

Hi. Please review the following patch, which creates static final instances of FindOp. Bug: https://bugs.openjdk.java.net/browse/JDK-8174267 I believe an additional test is not required as this is an implementation detail. ------- diff -r 83d37efcd2a5 src/java.base/share/classes/java/util/stream/FindOps.java --- a/src/java.base/share/classes/java/util/stream/FindOps.java Thu Apr 13 20:35:17 2017 +0000 +++ b/src/java.base/share/classes/java/util/stream/FindOps.java Fri Apr 28 19:28:36 2017 +0000 @@ -54,9 +54,10 @@ * first element in the encounter order * @return a {@code TerminalOp} implementing the find operation */ + @SuppressWarnings("unchecked") public static <T> TerminalOp<T, Optional<T>> makeRef(boolean mustFindFirst) { - return new FindOp<>(mustFindFirst, StreamShape.REFERENCE, Optional.empty(), - Optional::isPresent, FindSink.OfRef::new); + return (TerminalOp<T, Optional<T>>) + (mustFindFirst ? FindSink.OfRef.OP_FIND_FIRST : FindSink.OfRef.OP_FIND_ANY); } /** @@ -67,8 +68,7 @@ * @return a {@code TerminalOp} implementing the find operation */ public static TerminalOp<Integer, OptionalInt> makeInt(boolean mustFindFirst) { - return new FindOp<>(mustFindFirst, StreamShape.INT_VALUE, OptionalInt.empty(), - OptionalInt::isPresent, FindSink.OfInt::new); + return mustFindFirst ? FindSink.OfInt.OP_FIND_FIRST : FindSink.OfInt.OP_FIND_ANY; } /** @@ -79,8 +79,7 @@ * @return a {@code TerminalOp} implementing the find operation */ public static TerminalOp<Long, OptionalLong> makeLong(boolean mustFindFirst) { - return new FindOp<>(mustFindFirst, StreamShape.LONG_VALUE, OptionalLong.empty(), - OptionalLong::isPresent, FindSink.OfLong::new); + return mustFindFirst ? FindSink.OfLong.OP_FIND_FIRST : FindSink.OfLong.OP_FIND_ANY; } /** @@ -91,8 +90,7 @@ * @return a {@code TerminalOp} implementing the find operation */ public static TerminalOp<Double, OptionalDouble> makeDouble(boolean mustFindFirst) { - return new FindOp<>(mustFindFirst, StreamShape.DOUBLE_VALUE, OptionalDouble.empty(), - OptionalDouble::isPresent, FindSink.OfDouble::new); + return mustFindFirst ? FindSink.OfDouble.OP_FIND_FIRST : FindSink.OfDouble.OP_FIND_ANY; } /** @@ -195,6 +193,14 @@ public Optional<T> get() { return hasValue ? Optional.of(value) : null; } + + static final TerminalOp<?, ?> OP_FIND_FIRST = new FindOp<>(true, + StreamShape.REFERENCE, Optional.empty(), + Optional::isPresent, FindSink.OfRef::new); + + static final TerminalOp<?, ?> OP_FIND_ANY = new FindOp<>(false, + StreamShape.REFERENCE, Optional.empty(), + Optional::isPresent, FindSink.OfRef::new); } /** Specialization of {@code FindSink} for int streams */ @@ -210,6 +216,13 @@ public OptionalInt get() { return hasValue ? OptionalInt.of(value) : null; } + + static final TerminalOp<Integer, OptionalInt> OP_FIND_FIRST = new FindOp<>(true, + StreamShape.INT_VALUE, OptionalInt.empty(), + OptionalInt::isPresent, FindSink.OfInt::new); + static final TerminalOp<Integer, OptionalInt> OP_FIND_ANY = new FindOp<>(false, + StreamShape.INT_VALUE, OptionalInt.empty(), + OptionalInt::isPresent, FindSink.OfInt::new); } /** Specialization of {@code FindSink} for long streams */ @@ -225,6 +238,13 @@ public OptionalLong get() { return hasValue ? OptionalLong.of(value) : null; } + + static final TerminalOp<Long, OptionalLong> OP_FIND_FIRST = new FindOp<>(true, + StreamShape.LONG_VALUE, OptionalLong.empty(), + OptionalLong::isPresent, FindSink.OfLong::new); + static final TerminalOp<Long, OptionalLong> OP_FIND_ANY = new FindOp<>(false, + StreamShape.LONG_VALUE, OptionalLong.empty(), + OptionalLong::isPresent, FindSink.OfLong::new); } /** Specialization of {@code FindSink} for double streams */ @@ -240,6 +260,13 @@ public OptionalDouble get() { return hasValue ? OptionalDouble.of(value) : null; } + + static final TerminalOp<Double, OptionalDouble> OP_FIND_FIRST = new FindOp<>(true, + StreamShape.DOUBLE_VALUE, OptionalDouble.empty(), + OptionalDouble::isPresent, FindSink.OfDouble::new); + static final TerminalOp<Double, OptionalDouble> OP_FIND_ANY = new FindOp<>(false, + StreamShape.DOUBLE_VALUE, OptionalDouble.empty(), + OptionalDouble::isPresent, FindSink.OfDouble::new); } } ------- Ron

2 1

JDK test-only RFR of 8179452: Remove "intermittent" key from some tests which appear no longer to fail
by Brian Burkhalter 28 Apr '17

28 Apr '17

Please review at your convenience. Issue: https://bugs.openjdk.java.net/browse/JDK-8179452 Patch: [1] Thanks, Brian [1] diff --- a/test/java/io/FileInputStream/LargeFileAvailable.java +++ b/test/java/io/FileInputStream/LargeFileAvailable.java @@ -24,7 +24,6 @@ /* * @test * @bug 6402006 7030573 8011136 - * @key intermittent * @summary Test if available returns correct value when reading * a large file. * @run main/timeout=300 LargeFileAvailable --- a/test/java/nio/channels/FileChannel/LoopingTruncate.java +++ b/test/java/nio/channels/FileChannel/LoopingTruncate.java @@ -24,7 +24,6 @@ /** * @test * @bug 8137121 8137230 - * @key intermittent * @summary (fc) Infinite loop FileChannel.truncate * @library /lib/testlibrary * @build jdk.testlibrary.Utils --- a/test/java/nio/channels/FileChannel/Transfer.java +++ b/test/java/nio/channels/FileChannel/Transfer.java @@ -23,7 +23,6 @@ /* @test * @bug 4434723 4482726 4559072 4795550 5081340 5103988 6984545 - * @key intermittent * @summary Test FileChannel.transferFrom and transferTo (use -Dseed=X to set PRNG seed) * @library .. * @library /lib/testlibrary/ --- a/test/java/nio/channels/FileChannel/Transfers.java +++ b/test/java/nio/channels/FileChannel/Transfers.java @@ -22,7 +22,6 @@ */ /* @test - * @key intermittent * @summary Comprehensive test for FileChannel.transfer{From,To} * @bug 4708120 * @author Mark Reinhold

3 2

JDK 9 RFR of JDK-8179448: Mark ImageModules.java as failing intermittently
by joe darcy 28 Apr '17

28 Apr '17

Hello, The test jdk/modules/incubator/ImageModules.java has been seen to intermittently fail at a low frequency (JDK-8175022) and should be marked accordingly. Please review the patch below. Thanks, -Joe diff -r 7c04ab31b4d6 test/jdk/modules/incubator/ImageModules.java --- a/test/jdk/modules/incubator/ImageModules.java Wed Apr 26 09:37:23 2017 -0700 +++ b/test/jdk/modules/incubator/ImageModules.java Fri Apr 28 12:17:08 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, 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 @@ -26,6 +26,7 @@ * @bug 8170859 * @summary Basic test for incubator modules in jmods and images * @library /lib/testlibrary + * @key intermittent * @modules jdk.compiler jdk.jartool jdk.jlink * @build CompilerUtils * @run testng/othervm ImageModules

2 1

JDK 9 RFR: JDK-8177146 MethodHandles.Lookup::bind allows illegal protected access
by Ron Pressler 28 Apr '17

28 Apr '17

Hi. Please review, Bug: https://bugs.openjdk.java.net/browse/JDK-8177146 Webrev: http://cr.openjdk.java.net/~psandoz/jdk9/JDK-8177146-bind-protected-method/… ----- The patch contains a few changes: 1. The method `getDirectMethodCommon`, was changed so that if narrowing due to protected method access must be done, it will be done regardless of the flag doRestrict. 2. The private method ` getDirectMethodNoRestrict` was renamed to ` getDirectMethodNoRestrictInvokeSpecial`. 3. The method `bind` was changed to throw the correct exception type, IAException. 4. `restrictReceiver` was changed such that it never widens the receiver type. This could happen when the receiver was a subclass of the caller class, and triggered the assertion (this happened not only in calls to `bind` but also to `findVirtual`). ----- Thanks Ron

5 5

JDK 9 RFR(m): 8150488: Scanner.findAll() can return infinite stream if regex matches zero chars
by Stuart Marks 28 Apr '17

28 Apr '17

Hi all, Please review this fix [1] for JDK-8150488 [2] to prevent Scanner.findAll() from returning an infinite stream of zero-length matches in certain cases. This was previously an issue that simply documented this limitation. In the review for that issue [3], Timo K convinced me that this behavior is actually a bug, and Sherman convinced me that it's worth fixing in 9 since findAll() is a newly introduced API. Also, thanks to Sherman for providing an initial implementation. Thanks, s'marks [1] Webrev: http://cr.openjdk.java.net/~smarks/reviews/8150488/webrev.0/ [2] Bug: https://bugs.openjdk.java.net/browse/JDK-8150488 [3] Previous review threads: http://mail.openjdk.java.net/pipermail/core-libs-dev/2017-March/046995.html http://mail.openjdk.java.net/pipermail/core-libs-dev/2017-April/047055.html

2 1

RFR: 8179413: Fix remaining minor HTML5 issues in java.base module
by Jonathan Gibbons 28 Apr '17

28 Apr '17

Please review a handful of small changes that were not caught be the earlier bulk updates. Unlike those earlier updates, these few were determined manually. After these minor changes, all remaining issues in java.base are related to the use and appearance of tables. JBS: https://bugs.openjdk.java.net/browse/JDK-8179413 Webrev: http://cr.openjdk.java.net/~jjg/8179413/webrev/index.html -- Jon

5 5

RFR: 8179370: Replace use of <tt>, <center> and <font> tags in java.base
by Jonathan Gibbons 27 Apr '17

27 Apr '17

Please review these mostly simple changes to replace HTML tags which are not valid in HTML 5 in public doc comments in java.base. As with the previous changes, the changes were done mechanically, using the following sed script: s|<tt>|<code>|g s|</tt>|</code>|g s|<\\/tt>|<\\/code>|g s|\(<td[^>]*\)><center>\([^<]*\)</center>|\1 style="text-align:center">\2| s|<center><table |<div style="text-align:center"><table style="margin:0 auto" | s|</center>|</div>| s|<font |<span | s|</font>|</span>| The unusual form of the 3rd line was to cover the occurrence in a makefile. The 4th line is specific for DataInput.java, and replaces <center> within a <td> with a style on the <td> element itself. The 5th and 6th lines are specific to URLConnection. The use of the table itself and the ASCII art that follows it are questionable, but the intent here is just to update the HTML and not to rework the visual appearance of the generated documentation. The changes cover files in the following packages: java.base java/io java.base java/net java.base java/util java.base javax/net/ssl JBS: https://bugs.openjdk.java.net/browse/JDK-8179370 Webrev: http://cr.openjdk.java.net/~jjg/8179370/webrev/ -- Jon

6 8