[testng] 335/355: Fix classloading issue when using JMockit

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag OpenBSD
in repository testng.

commit f9baca06535476cacb322db5eff710d31b5199ff
Author: Mathieu SEBIRE <msebire at users.noreply.github.com>
Date:   Sun May 17 11:30:29 2015 +0200

    Fix classloading issue when using JMockit
---
 src/main/java/org/testng/TestNG.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
index 8f6ca1d..9bf024c 100644
--- a/src/main/java/org/testng/TestNG.java
+++ b/src/main/java/org/testng/TestNG.java
@@ -940,8 +940,9 @@ public class TestNG {
    * Using reflection to remain Java 5 compliant.
    */
   private void addServiceLoaderListeners() {
-      Iterable<ITestNGListener> loader =
-          ServiceLoader.load(ITestNGListener.class, m_serviceLoaderClassLoader);
+      Iterable<ITestNGListener> loader = m_serviceLoaderClassLoader != null ?
+          ServiceLoader.load(ITestNGListener.class, m_serviceLoaderClassLoader)
+          : ServiceLoader.load(ITestNGListener.class);
       for (ITestNGListener l : loader) {
         Utils.log("[TestNG]", 2, "Adding ServiceLoader listener:" + l);
         addListener(l);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git