Return-Path: Delivered-To: apmail-jakarta-log4j-dev-archive@www.apache.org Received: (qmail 111 invoked from network); 17 Sep 2003 16:10:11 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 17 Sep 2003 16:10:11 -0000 Received: (qmail 17112 invoked by uid 500); 17 Sep 2003 16:10:01 -0000 Delivered-To: apmail-jakarta-log4j-dev-archive@jakarta.apache.org Received: (qmail 17085 invoked by uid 500); 17 Sep 2003 16:10:01 -0000 Mailing-List: contact log4j-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Log4J Developers List" Reply-To: "Log4J Developers List" Delivered-To: mailing list log4j-dev@jakarta.apache.org Received: (qmail 17071 invoked by uid 500); 17 Sep 2003 16:10:01 -0000 Received: (qmail 17063 invoked from network); 17 Sep 2003 16:10:01 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 17 Sep 2003 16:10:01 -0000 Received: (qmail 99992 invoked by uid 1208); 17 Sep 2003 16:10:07 -0000 Date: 17 Sep 2003 16:10:07 -0000 Message-ID: <20030917161007.99991.qmail@minotaur.apache.org> From: ceki@apache.org To: jakarta-log4j-cvs@apache.org Subject: cvs commit: jakarta-log4j/tests/src/java/org/apache/log4j/util JunitTestRunnerFilter.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N ceki 2003/09/17 09:10:07 Modified: tests/src/java/org/apache/log4j/util JunitTestRunnerFilter.java Log: Fixed bug in JUnitTestRunnerFilter Revision Changes Path 1.2 +12 -7 jakarta-log4j/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java Index: JunitTestRunnerFilter.java =================================================================== RCS file: /home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/util/JunitTestRunnerFilter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- JunitTestRunnerFilter.java 12 Sep 2003 18:24:26 -0000 1.1 +++ JunitTestRunnerFilter.java 17 Sep 2003 16:10:07 -0000 1.2 @@ -59,16 +59,21 @@ * Filter out stack trace lines coming from the various JUnit TestRunners. */ public String filter(String in) { - if(in == null) - return null; - - if (util.match("/at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner/", in)) { + if (in == null) { + return null; + } + + if ( + util.match( + "/at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner/", in)) { + return null; + } else if ( + util.match( + "/at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner/", + in)) { return null; - } else if (util.match("/at org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner/", in)) { - return in; } else { return in; } } - } --------------------------------------------------------------------- To unsubscribe, e-mail: log4j-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: log4j-dev-help@jakarta.apache.org