infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-18 01:17:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

6961502: TEST_BUG: test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java fails

Browse Source 
Fix the test to define TestClass by DummyClassLoader as it intends to do

Reviewed-by: alanb
This commit is contained in:
Mandy Chung 2010-06-16 12:40:22 -07:00
parent fad23a5a1f
commit 0f0ac3ef39
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/test/ProblemList.txt
View File

@ -352,9 +352,6 @@ java/lang/management/RuntimeMXBean/UpTime.java generic-all
# Solaris sparc, samevm, java.lang.Exception: Read from closed pipe hangs
java/lang/Runtime/exec/SleepyCat.java generic-all
# Need to be marked othervm, or changed to be samevm safe
java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java generic-all
# Fedora 9 32bit, -client, samevm, Error while cleaning up threads after test
java/lang/management/ThreadMXBean/Locks.java generic-all

41
jdk/test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java
View File

@ -38,14 +38,17 @@ import java.io.*;
public class DefineClassByteBuffer {
static void test(ClassLoader cl) throws Exception {
Class c = Class.forName("TestClass", true, cl);
Class<?> c = Class.forName("TestClass", true, cl);
if (!"TestClass".equals(c.getName())) {
throw new RuntimeException("Got wrong class: " + c);
}
if (c.getClassLoader() != cl) {
throw new RuntimeException("TestClass defined by wrong classloader: " + c.getClassLoader());
}
}
public static void main(String arg[]) throws Exception {
ClassLoader[] cls = new ClassLoader[DummyClassLoader.MAX_TYPE];
DummyClassLoader[] cls = new DummyClassLoader[DummyClassLoader.MAX_TYPE];
for (int i = 0; i < cls.length; i++) {
cls[i] = new DummyClassLoader(i);
}
@ -53,7 +56,7 @@ public class DefineClassByteBuffer {
/* Create several instances of the class using different classloaders,
which are using different types of ByteBuffer. */
for (int i = 0; i < cls.length; i++) {
test(cls[i]);
test(cls[i]);
}
}
@ -100,12 +103,13 @@ public class DefineClassByteBuffer {
buffers. */
buffers[MAPPED_BUFFER] = readClassFile(CLASS_NAME + ".class");
byte[] array = new byte[buffers[MAPPED_BUFFER].limit()];
buffers[MAPPED_BUFFER].get(array).flip();
buffers[DIRECT_BUFFER] = ByteBuffer.allocateDirect(array.length);
buffers[DIRECT_BUFFER].put(array);
buffers[DIRECT_BUFFER].put(array).flip();
buffers[ARRAY_BUFFER] = ByteBuffer.allocate(array.length);
buffers[ARRAY_BUFFER].put(array);
buffers[ARRAY_BUFFER].put(array).flip();
buffers[WRAPPED_BUFFER] = ByteBuffer.wrap(array);
@ -118,9 +122,30 @@ public class DefineClassByteBuffer {
buffers[DUP_DIRECT_BUFFER] = buffers[DIRECT_BUFFER].duplicate();
}
public Class findClass(String name) {
return defineClass(name, buffers[loaderType], null);
}
protected Class<?> loadClass(String name, boolean resolve)
throws ClassNotFoundException
{
Class<?> c;
if (!"TestClass".equals(name)) {
c = super.loadClass(name, resolve);
} else {
// should not delegate to the system class loader
c = findClass(name);
if (resolve) {
resolveClass(c);
}
}
return c;
}
protected Class<?> findClass(String name)
throws ClassNotFoundException
{
if (!"TestClass".equals(name)) {
throw new ClassNotFoundException("Unexpected class: " + name);
}
return defineClass(name, buffers[loaderType], null);
}
} /* DummyClassLoader */
} /* DefineClassByteBuffer */