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 a687b1124c48ada47fc1f8fd0e2ce5818f452aa0 Author: Cedric Beust <[email protected]> Date: Sun Feb 1 08:50:51 2015 -0800 Small fixes to the pull request. --- src/main/java/org/testng/Reporter.java | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/testng/Reporter.java b/src/main/java/org/testng/Reporter.java index 79826a3..0deba10 100755 --- a/src/main/java/org/testng/Reporter.java +++ b/src/main/java/org/testng/Reporter.java @@ -7,7 +7,6 @@ import java.util.Vector; import org.testng.collections.Lists; import org.testng.collections.Maps; -import org.testng.internal.TestResult; import org.testng.util.Strings; /** @@ -45,7 +44,7 @@ public class Reporter { private static boolean m_escapeHtml = false; //This variable is responsible for persisting all output that is yet to be associated with any //valid TestResult objects. - private static ThreadLocal<List<String>> orphanedOutput = new InheritableThreadLocal<List<String>>(); + private static ThreadLocal<List<String>> m_orphanedOutput = new InheritableThreadLocal<List<String>>(); public static void setCurrentTestResult(ITestResult m) { m_currentTestResult.set(m); @@ -78,10 +77,10 @@ public class Reporter { if (m == null) { //Persist the output temporarily into a Threadlocal String list. - if (orphanedOutput.get() == null) { - orphanedOutput.set(new ArrayList<String>()); + if (m_orphanedOutput.get() == null) { + m_orphanedOutput.set(new ArrayList<String>()); } - orphanedOutput.get().add(s); + m_orphanedOutput.get().add(s); return; } @@ -93,12 +92,14 @@ public class Reporter { lines = Lists.newArrayList(); m_methodOutputMap.put(m.hashCode(), lines); } - //Lets check if there were already some orphaned output for the current Thread. - if (orphanedOutput.get() != null) { - n = n + orphanedOutput.get().size(); - getOutput().addAll(orphanedOutput.get()); - //since we have already added all of the orphaned output to the current TestResult, lets clear it off - orphanedOutput.remove(); + + // Check if there was already some orphaned output for the current thread. + if (m_orphanedOutput.get() != null) { + n = n + m_orphanedOutput.get().size(); + getOutput().addAll(m_orphanedOutput.get()); + // Since we have already added all of the orphaned output to the current + // TestResult, lets clear it off + m_orphanedOutput.remove(); } lines.add(n); getOutput().add(s); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
