From 008e969429a8a04cb7acd65f7192bb73b9f6243c Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Tue, 15 Jun 2010 20:34:49 -0700
Subject: [PATCH] 6961506: TEST_BUG: ResourceBundle/Bug4168625Test.java and
 TestBug4179766.java fails in samevm mode

Set the proper parent class loader of Loader and SimpleLoader

Reviewed-by: naoto
---
 jdk/test/ProblemList.txt                             |  4 ----
 .../java/util/ResourceBundle/Bug4168625Test.java     | 12 +++++++++---
 .../java/util/ResourceBundle/TestBug4179766.java     |  3 ++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 46fa2f07bef..69406ecb061 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -1233,10 +1233,6 @@ java/util/logging/LoggingMXBeanTest2.java			generic-all
 java/util/logging/LoggingNIOChange.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
 java/util/WeakHashMap/GCDuringIteration.java			generic-all
 
diff --git a/jdk/test/java/util/ResourceBundle/Bug4168625Test.java b/jdk/test/java/util/ResourceBundle/Bug4168625Test.java
index ef8d98698e5..8dc213db170 100644
--- a/jdk/test/java/util/ResourceBundle/Bug4168625Test.java
+++ b/jdk/test/java/util/ResourceBundle/Bug4168625Test.java
@@ -431,9 +431,11 @@ public class Bug4168625Test extends RBTestFmwk {
         private boolean network = false;
 
         public SimpleLoader() {
+            super(SimpleLoader.class.getClassLoader());
             this.network = false;
         }
         public SimpleLoader(boolean simulateNetworkLoad) {
+            super(SimpleLoader.class.getClassLoader());
             this.network = simulateNetworkLoad;
         }
         public Class loadClass(final String className, final boolean resolveIt)
@@ -448,7 +450,7 @@ public class Bug4168625Test extends RBTestFmwk {
                         } catch (java.lang.InterruptedException e) {
                         }
                     }
-                    result = super.findSystemClass(className);
+                    result = getParent().loadClass(className);
                     if ((result != null) && resolveIt) {
                         resolveClass(result);
                     }
@@ -464,11 +466,13 @@ public class Bug4168625Test extends RBTestFmwk {
         private String[] classesToWaitFor;
 
         public Loader() {
+            super(Loader.class.getClassLoader());
             classesToLoad = new String[0];
             classesToWaitFor = new String[0];
         }
 
         public Loader(final String[] classesToLoadIn, final String[] classesToWaitForIn) {
+            super(Loader.class.getClassLoader());
             classesToLoad = classesToLoadIn;
             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 {
-            return super.findSystemClass(className);
+            return getParent().loadClass(className);
         }
 
         public void logClasses(String title) {
diff --git a/jdk/test/java/util/ResourceBundle/TestBug4179766.java b/jdk/test/java/util/ResourceBundle/TestBug4179766.java
index 3546b134594..0c6a8b9bc9c 100644
--- a/jdk/test/java/util/ResourceBundle/TestBug4179766.java
+++ b/jdk/test/java/util/ResourceBundle/TestBug4179766.java
@@ -209,6 +209,7 @@ public class TestBug4179766 extends RBTestFmwk {
          * Create a new loader
          */
         public Loader(boolean sameHash) {
+            super(Loader.class.getClassLoader());
             if (sameHash) {
                 thisHashCode = SAME_HASH_CODE;
             } else {
@@ -287,7 +288,7 @@ public class TestBug4179766 extends RBTestFmwk {
          */
         private Class loadFromSystem(String className) throws ClassNotFoundException {
             try {
-                Class result = super.findSystemClass(className);
+                Class result = getParent().loadClass(className);
                 printInfo("        ***Returning system class: "+className, result);
                 return result;
             } catch (ClassNotFoundException e) {