stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6961506: TEST_BUG: ResourceBundle/Bug4168625Test.java and TestBug4179766.java fails in samevm mode

Browse Source 
Set the proper parent class loader of Loader and SimpleLoader

Reviewed-by: naoto
This commit is contained in:
Mandy Chung 2010-06-15 20:34:49 -07:00
parent fc99cf1793
commit 008e969429
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/test/ProblemList.txt
View File

@ -1233,10 +1233,6 @@ java/util/logging/LoggingMXBeanTest2.java generic-all
java/util/logging/LoggingNIOChange.java generic-all java/util/logging/LoggingNIOChange.java generic-all
java/util/logging/ParentLoggersTest.java generic-all java/util/logging/ParentLoggersTest.java generic-all
# Need to be marked othervm, or changed to be samevm safe
java/util/ResourceBundle/Bug4168625Test.java generic-all
java/util/ResourceBundle/TestBug4179766.java generic-all
# Need to be marked othervm, or changed to be samevm safe # Need to be marked othervm, or changed to be samevm safe
java/util/WeakHashMap/GCDuringIteration.java generic-all java/util/WeakHashMap/GCDuringIteration.java generic-all

12
jdk/test/java/util/ResourceBundle/Bug4168625Test.java
View File

@ -431,9 +431,11 @@ public class Bug4168625Test extends RBTestFmwk {
private boolean network = false; private boolean network = false;
public SimpleLoader() { public SimpleLoader() {
super(SimpleLoader.class.getClassLoader());
this.network = false; this.network = false;
} }
public SimpleLoader(boolean simulateNetworkLoad) { public SimpleLoader(boolean simulateNetworkLoad) {
super(SimpleLoader.class.getClassLoader());
this.network = simulateNetworkLoad; this.network = simulateNetworkLoad;
} }
public Class loadClass(final String className, final boolean resolveIt) public Class loadClass(final String className, final boolean resolveIt)
@ -448,7 +450,7 @@ public class Bug4168625Test extends RBTestFmwk {
} catch (java.lang.InterruptedException e) { } catch (java.lang.InterruptedException e) {
} }
} }
result = super.findSystemClass(className); result = getParent().loadClass(className);
if ((result != null) && resolveIt) { if ((result != null) && resolveIt) {
resolveClass(result); resolveClass(result);
} }
@ -464,11 +466,13 @@ public class Bug4168625Test extends RBTestFmwk {
private String[] classesToWaitFor; private String[] classesToWaitFor;
public Loader() { public Loader() {
super(Loader.class.getClassLoader());
classesToLoad = new String[0]; classesToLoad = new String[0];
classesToWaitFor = new String[0]; classesToWaitFor = new String[0];
} }
public Loader(final String[] classesToLoadIn, final String[] classesToWaitForIn) { public Loader(final String[] classesToLoadIn, final String[] classesToWaitForIn) {
super(Loader.class.getClassLoader());
classesToLoad = classesToLoadIn; classesToLoad = classesToLoadIn;
classesToWaitFor = classesToWaitForIn; classesToWaitFor = classesToWaitForIn;
} }
@ -544,10 +548,12 @@ public class Bug4168625Test extends RBTestFmwk {
} }
/** /**
* Delegate loading to the system loader * Delegate loading to its parent class loader that loads the test classes.
* In othervm mode, the parent class loader is the system class loader;
* in samevm mode, the parent class loader is the jtreg URLClassLoader.
*/ */
private Class loadFromSystem(String className) throws ClassNotFoundException { private Class loadFromSystem(String className) throws ClassNotFoundException {
return super.findSystemClass(className); return getParent().loadClass(className);
} }
public void logClasses(String title) { public void logClasses(String title) {

3
jdk/test/java/util/ResourceBundle/TestBug4179766.java
View File

@ -209,6 +209,7 @@ public class TestBug4179766 extends RBTestFmwk {
* Create a new loader * Create a new loader
*/ */
public Loader(boolean sameHash) { public Loader(boolean sameHash) {
super(Loader.class.getClassLoader());
if (sameHash) { if (sameHash) {
thisHashCode = SAME_HASH_CODE; thisHashCode = SAME_HASH_CODE;
} else { } else {
@ -287,7 +288,7 @@ public class TestBug4179766 extends RBTestFmwk {
*/ */
private Class loadFromSystem(String className) throws ClassNotFoundException { private Class loadFromSystem(String className) throws ClassNotFoundException {
try { try {
Class result = super.findSystemClass(className); Class result = getParent().loadClass(className);
printInfo(" ***Returning system class: "+className, result); printInfo(" ***Returning system class: "+className, result);
return result; return result;
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {