commit f38bbfab2b620883b38039baac48585efd057bf3
author Cedric Beust <cedric@beust.com> Mon Aug 08 10:56:21 2011 -0700
committer Cedric Beust <cedric@beust.com> Mon Aug 08 10:56:21 2011 -0700
tree d854200dab965676b76bd3a3eb92c702cf7196c2
parent 10a202a9e96a8067720d9e2a301ee6b67f5df5ed

Fixed: ServiceLoader wasn't resolving correctly if no service loader classloader was specified.

CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index 61c7bc9..044fee1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@
 Added: IConfigurationListener is now a public listener
 Added: When a method fails, only dependents of the same instance will be skipped
 Added: parallel=instances for factory instance parallel runs
+Fixed: ServiceLoader wasn't resolving correctly if no service loader classloader was specified
 Fixed: Better ordering with mixed priorities and dependencies
 Fixed: Improved detection of graph cycles in parallel runs
 Fixed: @BeforeTest was invoked multiple times if a factory is used

src/main/java/org/testng/TestNG.java

diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
index fb82d89..c426492 100644
--- a/src/main/java/org/testng/TestNG.java
+++ b/src/main/java/org/testng/TestNG.java
@@ -920,7 +920,7 @@
         parameters.add(m_serviceLoaderClassLoader);
         loadMethod = c.getMethod("load", Class.class, ClassLoader.class);
       } else {
-        loadMethod = c.getMethod("load");
+        loadMethod = c.getMethod("load", Class.class);
       }
       Iterable<ITestNGListener> loader =
           (Iterable<ITestNGListener>) loadMethod.invoke(c, parameters.toArray());