mirror of
https://github.com/openjdk/jdk.git
synced 2026-02-28 03:00:41 +00:00
Merge
This commit is contained in:
commit
ec0a5ac8fe
@ -76,8 +76,8 @@ import java.util.List;
|
||||
* must succeed if the following would succeed (ignoring
|
||||
* encoding issues):
|
||||
* {@snippet id="equiv-input" lang=java :
|
||||
* // @link substring=FileInputStream target="java.io.FileInputStream#FileInputStream(File)" @link regex="File\b" target="File#File(java.net.URI)" @link substring=fileObject target=FileObject @link substring=toURI target="FileObject#toUri()" :
|
||||
* new FileInputStream(new File(fileObject.toURI()))
|
||||
* // @link substring=FileInputStream target="java.io.FileInputStream#FileInputStream(File)" @link regex="File\b" target="File#File(java.net.URI)" @link substring=fileObject target=FileObject @link substring=toUri target="FileObject#toUri()" :
|
||||
* new FileInputStream(new File(fileObject.toUri()))
|
||||
* }
|
||||
* </li>
|
||||
* <li>
|
||||
@ -87,8 +87,8 @@ import java.util.List;
|
||||
* succeed if the following would succeed (ignoring encoding
|
||||
* issues):
|
||||
* {@snippet id="equiv-output" lang=java :
|
||||
* // @link substring=FileOutputStream target="java.io.FileOutputStream#FileOutputStream(File)" @link regex="File\b" target="File#File(java.net.URI)" @link substring=fileObject target=FileObject @link substring=toURI target="FileObject#toUri()" :
|
||||
* new FileOutputStream(new File(fileObject.toURI()))
|
||||
* // @link substring=FileOutputStream target="java.io.FileOutputStream#FileOutputStream(File)" @link regex="File\b" target="File#File(java.net.URI)" @link substring=fileObject target=FileObject @link substring=toUri target="FileObject#toUri()" :
|
||||
* new FileOutputStream(new File(fileObject.toUri()))
|
||||
* }
|
||||
* </li>
|
||||
* </ul>
|
||||
|
||||
@ -567,6 +567,7 @@ com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java 8030957 aix-all
|
||||
java/lang/management/MemoryMXBean/Pending.java 8158837 generic-all
|
||||
java/lang/management/MemoryMXBean/PendingAllGC.sh 8158837 generic-all
|
||||
java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java 8247426 generic-all
|
||||
java/lang/management/ThreadMXBean/ThreadLists.java 8132785 generic-all
|
||||
|
||||
sun/management/jdp/JdpDefaultsTest.java 8241865 linux-aarch64,macosx-all
|
||||
sun/management/jdp/JdpJmxRemoteDynamicPortTest.java 8241865 macosx-all
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user