ForceLoad API needs the classloader also

* since bundles may be loaded by a different classloader
  we'll need to provide the correct one in order to
  find the class defs.

2 files changed, 7 insertions, 4 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/system/ForceLoad.java b/vespajlib/src/main/java/com/yahoo/system/ForceLoad.java
index f924740321f..4946f3b8033 100644
--- a/vespajlib/src/main/java/com/yahoo/system/ForceLoad.java
+++ b/vespajlib/src/main/java/com/yahoo/system/ForceLoad.java
@@ -15,14 +15,14 @@ public class ForceLoad {
      * @param classNames array of names of classes (without package prefix)
      *                   to force load.
      **/
-    public static void forceLoad(String packageName, String[] classNames)
+    public static void forceLoad(String packageName, String[] classNames, ClassLoader loader)
         throws ForceLoadError
     {
         String fullClassName = "";
         try {
             for (String className : classNames) {
                 fullClassName = packageName + "." + className;
-                Class.forName(fullClassName);
+                loader.loadClass(fullClassName);
             }
         } catch (Exception e) {
             throw new ForceLoadError(fullClassName, e);
diff --git a/vespajlib/src/test/java/com/yahoo/system/ForceLoadTestCase.java b/vespajlib/src/test/java/com/yahoo/system/ForceLoadTestCase.java
index ec4f716247e..078142014cd 100644
--- a/vespajlib/src/test/java/com/yahoo/system/ForceLoadTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/system/ForceLoadTestCase.java
@@ -8,8 +8,10 @@ public class ForceLoadTestCase extends junit.framework.TestCase {
     }
 
     public void testLoadClasses() {
+
         try {
-            ForceLoad.forceLoad(getClass().getPackage().getName(), new String[] { "Foo", "Bar" });
+            ForceLoad.forceLoad(getClass().getPackage().getName(), new String[] { "Foo", "Bar" },
+                                this.getClass().getClassLoader());
         } catch (ForceLoadError e) {
             e.printStackTrace();
             assertTrue(false);
@@ -18,7 +20,8 @@ public class ForceLoadTestCase extends junit.framework.TestCase {
 
     public void testLoadBogusClass() {
         try {
-            ForceLoad.forceLoad(getClass().getPackage().getName(), new String[] { "Foo", "Bar", "Baz" });
+            ForceLoad.forceLoad(getClass().getPackage().getName(), new String[] { "Foo", "Bar", "Baz" },
+                                this.getClass().getClassLoader());
         } catch (ForceLoadError e) {
             return;
         }