From dev-return-60672-apmail-ant-dev-archive=ant.apache.org@ant.apache.org Wed Oct 06 15:42:00 2004 Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 25115 invoked from network); 6 Oct 2004 15:42:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 6 Oct 2004 15:42:00 -0000 Received: (qmail 23015 invoked by uid 500); 6 Oct 2004 15:41:05 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 22906 invoked by uid 500); 6 Oct 2004 15:41:03 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 22668 invoked by uid 500); 6 Oct 2004 15:41:00 -0000 Received: (qmail 22623 invoked by uid 99); 6 Oct 2004 15:40:59 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 06 Oct 2004 08:40:59 -0700 Received: (qmail 23845 invoked by uid 1146); 6 Oct 2004 15:40:57 -0000 Date: 6 Oct 2004 15:40:57 -0000 Message-ID: <20041006154057.23844.qmail@minotaur.apache.org> From: bodewig@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTask.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bodewig 2004/10/06 08:40:57 Modified: src/main/org/apache/tools/ant/taskdefs/optional/junit Tag: ANT_16_BRANCH JUnitTask.java Log: Merge fix for 27420 Revision Changes Path No revision No revision 1.83.2.14 +18 -9 ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java Index: JUnitTask.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v retrieving revision 1.83.2.13 retrieving revision 1.83.2.14 diff -u -r1.83.2.13 -r1.83.2.14 --- JUnitTask.java 27 Jul 2004 14:25:11 -0000 1.83.2.13 +++ JUnitTask.java 6 Oct 2004 15:40:56 -0000 1.83.2.14 @@ -641,14 +641,20 @@ testLists.addAll(executeOrQueue(tests.elements(), forkPerTest)); } - Iterator iter = testLists.iterator(); - while (iter.hasNext()) { - List l = (List) iter.next(); - if (l.size() == 1) { - execute((JUnitTest) l.get(0)); - } else { - execute(l); - } + try { + Iterator iter = testLists.iterator(); + while (iter.hasNext()) { + List l = (List) iter.next(); + if (l.size() == 1) { + execute((JUnitTest) l.get(0)); + } else { + execute(l); + } + } + } finally { + if (classLoader != null && reloading) { + classLoader.cleanup(); + } } } @@ -1066,6 +1072,9 @@ } if (classLoader != null) { classLoader.resetThreadContextLoader(); + if (!reloading) { + classLoader.cleanup(); + } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org