Mercurial > hg > openjdk > jdk9 > hotspot
changeset 9008:1ae4191359d8 jdk9-b86
Merge
author | lana |
---|---|
date | Fri, 09 Oct 2015 10:22:27 -0700 |
parents | 33e891f71711 (current diff) c58e4c0700f5 (diff) |
children | d7ffd16382fe f108f239ffcf |
files | |
diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java Thu Oct 08 22:30:35 2015 -0700 +++ b/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java Fri Oct 09 10:22:27 2015 -0700 @@ -23,8 +23,8 @@ import sun.hotspot.WhiteBox; import sun.misc.Unsafe; -import sun.misc.IOUtils; +import java.io.IOException; import java.lang.reflect.Method; import java.net.URL; import java.net.URLConnection; @@ -109,7 +109,13 @@ // (1) Load an anonymous version of this class using the corresponding Unsafe method URL classUrl = TestAnonymousClassUnloading.class.getResource("TestAnonymousClassUnloading.class"); URLConnection connection = classUrl.openConnection(); - byte[] classBytes = IOUtils.readFully(connection.getInputStream(), connection.getContentLength(), true); + + int length = connection.getContentLength(); + byte[] classBytes = connection.getInputStream().readAllBytes(); + if (length != -1 && classBytes.length != length) { + throw new IOException("Expected:" + length + ", actual: " + classBytes.length); + } + Class<?> anonymousClass = UNSAFE.defineAnonymousClass(TestAnonymousClassUnloading.class, classBytes, null); // (2) Make sure all paths of doWork are profiled and compiled
--- a/test/runtime/8003720/VictimClassLoader.java Thu Oct 08 22:30:35 2015 -0700 +++ b/test/runtime/8003720/VictimClassLoader.java Fri Oct 09 10:22:27 2015 -0700 @@ -72,8 +72,10 @@ } static byte[] readFully(java.io.InputStream in, int len) throws java.io.IOException { - // Warning here: - return sun.misc.IOUtils.readFully(in, len, true); + byte[] b = in.readAllBytes(); + if (len != -1 && b.length != len) + throw new java.io.IOException("Expected:" + len + ", actual:" + b.length); + return b; } public void finalize() {